Merge pull request #67 from Nexters/feature/image-upload-navigation-FD-261

[FD-261] 이미지 업로드 후 화면 이동

Author: Hoseong-Ryu

app/src/main/java/com/nexters/fooddiary/navigation/FoodDiaryNavHost.kt

@@ -313,10 +313,24 @@ fun FoodDiaryNavHost(
                 )
 
                 imageScreen(
-                    onClose = {
-                        if (!navController.popBackStack()) {
+                    onClose = { selectedDateString ->
+                        val previousIsDetail =
+                            navController.previousBackStackEntry?.destination?.hasRoute(DetailRoute::class) == true
+                        if (previousIsDetail && !selectedDateString.isNullOrBlank()) {
+                            navController.popBackStack()
+                            navController.popBackStack()
+                            navController.navigate(DetailRoute(dateString = selectedDateString)) {
+                                launchSingleTop = true
+                            }
+                        } else if (!navController.popBackStack()) {
                             onFinish()
                         }
+                    },
+                    onUploadSuccess = { uploadedDate ->
+                        navController.popBackStack()
+                        navController.navigate(DetailRoute(dateString = uploadedDate.toString())) {
+                            launchSingleTop = true
+                        }
                     }
                 )
 

data/src/main/java/com/nexters/fooddiary/data/remote/photo/model/response/BatchUploadResponse.kt

@@ -5,46 +5,18 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class BatchUploadResponse(
-    @SerialName("results")
-    val results: List<BatchUploadResultItem>
+    @SerialName("diary_date")
+    val diaryDate: String? = null,
+    @SerialName("diaries")
+    val diaries: List<BatchUploadDiaryItem> = emptyList(),
 )
 
 @Serializable
-data class BatchUploadResultItem(
-    @SerialName("analysis")
-    val analysis: BatchUploadAnalysis?,
+data class BatchUploadDiaryItem(
     @SerialName("diary_id")
     val diaryId: Long,
-    @SerialName("image_url")
-    val imageUrl: String,
-    @SerialName("photo_id")
-    val photoId: Long,
+    @SerialName("diary_status")
+    val diaryStatus: String,
     @SerialName("time_type")
-    val timeType: String
-)
-
-@Serializable
-data class BatchUploadAnalysis(
-    @SerialName("food_category")
-    val foodCategory: String? = null,
-    @SerialName("keywords")
-    val keywords: List<String>? = null,
-    @SerialName("menu_candidates")
-    val menuCandidates: List<BatchUploadMenuCandidate>? = null,
-    @SerialName("restaurant_candidates")
-    val restaurantCandidates: List<BatchUploadRestaurantCandidate>? = null
-)
-
-@Serializable
-data class BatchUploadMenuCandidate(
-    @SerialName("name")
-    val name: String
-)
-
-@Serializable
-data class BatchUploadRestaurantCandidate(
-    @SerialName("confidence")
-    val confidence: Double,
-    @SerialName("name")
-    val name: String
+    val timeType: String,
 )

data/src/main/java/com/nexters/fooddiary/data/repository/PhotoRepositoryImpl.kt

@@ -9,7 +9,7 @@ import com.nexters.fooddiary.data.remote.photo.PhotoApi
 import com.nexters.fooddiary.core.common.network.defaultMessage
 import com.nexters.fooddiary.core.common.resource.ResourceProvider
 import com.nexters.fooddiary.data.network.toNetworkError
-import com.nexters.fooddiary.data.remote.photo.model.response.BatchUploadResultItem
+import com.nexters.fooddiary.data.remote.photo.model.response.BatchUploadDiaryItem
 import com.nexters.fooddiary.domain.repository.PhotoRepository
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -66,7 +66,7 @@ internal class PhotoRepositoryImpl @Inject constructor(
                 ),
                 photos = parts
             )
-            recordPendingUploads(response.results, uploadDateStr)
+            recordPendingUploads(response.diaries, uploadDateStr)
             Result.success(Unit)
         } catch (e: Exception) {
             recordUploadFailure(uploadDateStr, e)
@@ -94,14 +94,12 @@ internal class PhotoRepositoryImpl @Inject constructor(
     }
 
     private suspend fun recordPendingUploads(
-        results: List<BatchUploadResultItem>,
+        diaries: List<BatchUploadDiaryItem>,
         uploadDateStr: String
     ) {
-        val entities = results.map { item ->
+        val entities = diaries.map { item ->
             PhotoUploadEntity(
-                photoId = item.photoId,
                 diaryId = item.diaryId,
-                imageUrl = item.imageUrl,
                 timeType = item.timeType,
                 uploadDate = uploadDateStr,
                 status = UploadStatus.PENDING

presentation/image/src/main/java/com/nexters/fooddiary/presentation/image/ImagePickerScreen.kt

@@ -1,6 +1,7 @@
 package com.nexters.fooddiary.presentation.image
 
 import android.net.Uri
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Image
@@ -32,6 +33,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import com.airbnb.mvrx.compose.collectAsState
 import com.airbnb.mvrx.compose.mavericksViewModel
@@ -57,6 +59,7 @@ import com.nexters.fooddiary.core.ui.theme.Gray050
 import com.nexters.fooddiary.core.ui.theme.Gray400
 import com.nexters.fooddiary.core.ui.theme.PrimBase
 import com.nexters.fooddiary.core.ui.theme.SdBase
+import java.time.LocalDate
 
 private const val PREVIEW_IMAGE_URL = "https://picsum.photos/200/200?random="
 
@@ -93,9 +96,13 @@ fun ImagePickerScreen(
     modifier: Modifier = Modifier,
     selectedDateString: String? = null,
     onClose: () -> Unit,
+    onUploadSuccess: (LocalDate) -> Unit = {},
     viewModel: ImagePickerViewModel = mavericksViewModel()
 ) {
     val state by viewModel.collectAsState()
+    val currentOnUploadSuccess by rememberUpdatedState(onUploadSuccess)
+
+    BackHandler(onBack = onClose)
 
     LaunchedEffect(selectedDateString) {
         viewModel.loadPhotos(selectedDateString)
@@ -116,6 +123,13 @@ fun ImagePickerScreen(
         }
     }
 
+    LaunchedEffect(state.uploadSucceededDate) {
+        state.uploadSucceededDate?.let { uploadedDate ->
+            currentOnUploadSuccess(uploadedDate)
+            viewModel.consumeUploadSuccess()
+        }
+    }
+
     ImagePickerContent(
         modifier = modifier,
         foodImageUris = state.foodImageUris,
@@ -126,12 +140,7 @@ fun ImagePickerScreen(
         onImageClick = { uri -> viewModel.toggleImageSelection(uri) },
         onDeselectAll = { viewModel.clearSelection() },
         onDone = {
-            viewModel.uploadImage { result ->
-                when (result) {
-                    is UploadResult.Success -> onClose()
-                    is UploadResult.Failure -> { /* 실패 시 처리 없음 */ }
-                }
-            }
+            viewModel.uploadImage()
         },
         onClose = onClose,
         onRequestPermission = { permissionLauncher.launch(requiredPermission) }

presentation/image/src/main/java/com/nexters/fooddiary/presentation/image/ImagePickerState.kt

@@ -11,4 +11,5 @@ data class ImagePickerState(
     val hasPermission: Boolean = false,
     val selectedUris: Set<Uri> = emptySet(),
     val filterDate: LocalDate? = null,
+    val uploadSucceededDate: LocalDate? = null,
 ) : MavericksState

presentation/image/src/main/java/com/nexters/fooddiary/presentation/image/ImagePickerViewModel.kt

@@ -16,11 +16,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 
-sealed class UploadResult {
-    data object Success : UploadResult()
-    data class Failure(val error: Throwable? = null) : UploadResult()
-}
-
 internal fun nextSelectionAfterToggle(current: Set<Uri>, uri: Uri, maxCount: Int): Set<Uri> =
     if (current.contains(uri)) current - uri
     else if (current.size < maxCount) current + uri
@@ -52,6 +47,7 @@ class ImagePickerViewModel @AssistedInject constructor(
                 allImageUris = emptyList(),
                 foodImageUris = emptyList(),
                 isLoading = true,
+                uploadSucceededDate = null,
             )
         }
         withState { state ->
@@ -94,17 +90,20 @@ class ImagePickerViewModel @AssistedInject constructor(
         setState { copy(selectedUris = emptySet()) }
     }
 
-    fun uploadImage(onResult: (UploadResult) -> Unit) {
+    fun uploadImage() {
         viewModelScope.launch {
             val urisToUpload = selectedUrisAsStrings()
             if (urisToUpload.isEmpty()) {
-                onResult(UploadResult.Failure())
                 return@launch
             }
-            performUpload(urisToUpload, onResult)
+            performUpload(urisToUpload)
         }
     }
 
+    fun consumeUploadSuccess() {
+        setState { copy(uploadSucceededDate = null) }
+    }
+
     @AssistedFactory
     interface Factory : AssistedViewModelFactory<ImagePickerViewModel, ImagePickerState> {
         override fun create(state: ImagePickerState): ImagePickerViewModel
@@ -137,13 +136,14 @@ class ImagePickerViewModel @AssistedInject constructor(
     private suspend fun selectedUrisAsStrings(): List<String> =
         awaitState().selectedUris.map { it.toString() }
 
-    private suspend fun performUpload(
-        urisToUpload: List<String>,
-        onResult: (UploadResult) -> Unit
-    ) {
+    private suspend fun performUpload(urisToUpload: List<String>) {
         val targetDate = awaitState().filterDate ?: LocalDate.now()
         batchUploadPhotosUseCase(targetDate, urisToUpload)
-            .onSuccess { onResult(UploadResult.Success) }
-            .onFailure { e -> onResult(UploadResult.Failure(e)) }
+            .onSuccess {
+                setState { copy(uploadSucceededDate = targetDate) }
+            }
+            .onFailure {
+                // 실패 시 현재 화면 유지 (기존 동작)
+            }
     }
 }

presentation/image/src/main/java/com/nexters/fooddiary/presentation/image/navigation/ImageNavigation.kt

@@ -5,21 +5,23 @@ import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import com.nexters.fooddiary.presentation.image.ImagePickerScreen
 import kotlinx.serialization.Serializable
+import java.time.LocalDate
 
 @Serializable
 data class ImagePickerRoute(
     val dateString: String? = null
 )
 
 fun NavGraphBuilder.imageScreen(
-    onClose: () -> Unit
+    onClose: (String?) -> Unit,
+    onUploadSuccess: (LocalDate) -> Unit,
 ) {
     composable<ImagePickerRoute> { backStackEntry ->
         val route = backStackEntry.toRoute<ImagePickerRoute>()
         ImagePickerScreen(
             selectedDateString = route.dateString,
-            onClose = onClose,
+            onClose = { onClose(route.dateString) },
+            onUploadSuccess = onUploadSuccess,
         )
     }
 }
-