Merge pull request #77 from YAPP-Github/epic/moneymong-124-소속

Heonbyeong · web-flow · commit 7450babde8f0 · 2024-02-01T23:24:07.000+09:00
Epic/moneymong 124 소속 -&gt; develop merge
diff --git a/data/src/main/java/com/moneymong/moneymong/data/mapper/agency/AgenciesGetMapper.kt b/data/src/main/java/com/moneymong/moneymong/data/mapper/agency/AgenciesGetMapper.kt
@@ -12,8 +12,7 @@ fun AgencyGetResponse.toEntity() = AgencyGetEntity(
     type = when (type) {
         "IN_SCHOOL_CLUB" -> AgencyGetEntity.AgencyType.CLUB
         "STUDENT_COUNCIL" -> AgencyGetEntity.AgencyType.COUNCIL
-//        else -> throw IllegalArgumentException("Unknown type: $type")
-        else -> AgencyGetEntity.AgencyType.CLUB
+        else -> throw IllegalArgumentException("Unknown type: $type")
     }
 )
 
diff --git a/data/src/main/java/com/moneymong/moneymong/data/pagingsource/AgencyPagingSource.kt b/data/src/main/java/com/moneymong/moneymong/data/pagingsource/AgencyPagingSource.kt
@@ -18,13 +18,13 @@ class AgencyPagingSource(
 
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, AgencyGetResponse> {
         val page = params.key ?: START_PAGE
-        val size = params.loadSize
-        return dataSource.getAgencies(page = page, size = size).fold(
+        val loadSize = params.loadSize
+        return dataSource.getAgencies(page = page, size = loadSize).fold(
             onSuccess = {
                 LoadResult.Page(
                     data = it.agencies,
                     prevKey = null,
-                    nextKey = if (it.agencies.isEmpty()) null else page + 1
+                    nextKey = if (it.agencies.size < loadSize) null else page + 1
                 )
             },
             onFailure = {
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/navigation/AgencyRegisterNavigation.kt
@@ -1,8 +1,5 @@
 package com.moneymong.moneymong.feature.agency.navigation
 
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
-import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterState.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterState.kt
@@ -2,7 +2,7 @@ package com.moneymong.moneymong.feature.agency.register
 
 import androidx.compose.ui.text.input.TextFieldValue
 import com.moneymong.moneymong.common.base.State
-import com.moneymong.moneymong.feature.agency.AgencyType
+import com.moneymong.moneymong.feature.agency.search.AgencyType
 
 data class AgencyRegisterState(
     val agencyName: TextFieldValue = TextFieldValue(),
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterViewModel.kt
@@ -6,7 +6,7 @@ import com.moneymong.moneymong.common.error.MoneyMongError
 import com.moneymong.moneymong.domain.param.agency.AgencyRegisterParam
 import com.moneymong.moneymong.domain.usecase.agency.RegisterAgencyUseCase
 import com.moneymong.moneymong.domain.usecase.agency.SaveAgencyIdUseCase
-import com.moneymong.moneymong.feature.agency.AgencyType
+import com.moneymong.moneymong.feature.agency.search.AgencyType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.annotation.OrbitExperimental
 import org.orbitmvi.orbit.syntax.simple.blockingIntent
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/complete/AgencyRegisterCompleteScreen.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/complete/AgencyRegisterCompleteScreen.kt
@@ -1,5 +1,6 @@
 package com.moneymong.moneymong.feature.agency.register.complete
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -49,6 +50,8 @@ fun AgencyRegisterCompleteScreen(
         }
     }
 
+    BackHandler { viewModel.navigateToAgencySearch() }
+
     Column(
         modifier = modifier
             .fillMaxSize()
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/view/AgencyRegisterContentView.kt
@@ -28,7 +28,7 @@ import com.moneymong.moneymong.design_system.theme.Body2
 import com.moneymong.moneymong.design_system.theme.Gray06
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.Heading2
-import com.moneymong.moneymong.feature.agency.AgencyType
+import com.moneymong.moneymong.feature.agency.search.AgencyType
 
 @Composable
 internal fun AgencyResisterContentView(
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/Agency.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/Agency.kt
@@ -1,6 +1,7 @@
-package com.moneymong.moneymong.feature.agency
+package com.moneymong.moneymong.feature.agency.search
 
 import com.moneymong.moneymong.domain.entity.agency.AgencyGetEntity
+import com.moneymong.moneymong.domain.entity.agency.MyAgencyEntity
 import com.moneymong.moneymong.domain.param.agency.AgencyRegisterParam
 
 data class Agency(
@@ -22,6 +23,19 @@ fun AgencyGetEntity.toAgency(): Agency {
     )
 }
 
+fun MyAgencyEntity.toAgency(): Agency {
+    return Agency(
+        id = this.id.toLong(),
+        type = when (this.type) {
+            "IN_SCHOOL_CLUB" -> AgencyType.CLUB
+            "STUDENT_COUNCIL" -> AgencyType.COUNCIL
+            else -> throw IllegalArgumentException("Unknown type: $type")
+        },
+        name = this.name,
+        memberCount = this.headCount
+    )
+}
+
 enum class AgencyType(val text: String) {
     CLUB(text = "동아리"),
     COUNCIL(text = "학생회");
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -25,10 +26,12 @@ import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
+import com.moneymong.moneymong.common.error.MoneyMongError
 import com.moneymong.moneymong.design_system.R
 import com.moneymong.moneymong.design_system.component.button.MDSFloatingActionButton
 import com.moneymong.moneymong.design_system.component.tooltip.MDSToolTip
 import com.moneymong.moneymong.design_system.component.tooltip.MDSToolTipPosition
+import com.moneymong.moneymong.design_system.error.ErrorDialog
 import com.moneymong.moneymong.design_system.error.ErrorItem
 import com.moneymong.moneymong.design_system.error.ErrorScreen
 import com.moneymong.moneymong.design_system.loading.LoadingItem
@@ -38,9 +41,10 @@ import com.moneymong.moneymong.design_system.theme.Gray01
 import com.moneymong.moneymong.design_system.theme.Gray08
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
 import com.moneymong.moneymong.design_system.theme.Red03
-import com.moneymong.moneymong.feature.agency.Agency
 import com.moneymong.moneymong.feature.agency.search.component.AgencySearchTopBar
 import com.moneymong.moneymong.feature.agency.search.item.AgencyItem
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
 
 @Composable
 fun AgencySearchScreen(
@@ -49,8 +53,27 @@ fun AgencySearchScreen(
     navigateToRegister: () -> Unit,
     navigateAgencyJoin: (agencyId: Long) -> Unit
 ) {
+    val state by viewModel.collectAsState()
     val pagingItems = viewModel.agencies.collectAsLazyPagingItems()
 
+    viewModel.collectSideEffect {
+        when (it) {
+            is AgencySearchSideEffect.NavigateToRegister -> {
+                navigateToRegister()
+            }
+
+            is AgencySearchSideEffect.NavigateToAgencyJoin -> {
+                navigateAgencyJoin(it.agencyId)
+            }
+        }
+    }
+
+    if (state.visibleWarningDialog) {
+        ErrorDialog(message = "이미 가입된 소속입니다") {
+            viewModel.changeVisibleWarningDialog(false)
+        }
+    }
+
     Box(
         modifier = modifier
             .fillMaxSize()
@@ -65,7 +88,17 @@ fun AgencySearchScreen(
             AgencySearchContentView(
                 modifier = Modifier.weight(1f),
                 pagingItems = pagingItems,
-                onClickItem = navigateAgencyJoin
+                onClickItem = { agencyId ->
+                    if (agencyId in state.joinedAgenciesIds) {
+                        viewModel.changeVisibleWarningDialog(true)
+                    } else {
+                        viewModel.navigateToJoin(agencyId)
+                    }
+                },
+                isLoading = state.isLoading,
+                isError = state.isError,
+                errorMessage = state.errorMessage,
+                fetchMyAgencyList = viewModel::fetchMyAgencyList
             )
         }
         Column(
@@ -82,7 +115,7 @@ fun AgencySearchScreen(
                 Spacer(modifier = Modifier.height(8.dp))
             }
             MDSFloatingActionButton(
-                onClick = navigateToRegister,
+                onClick = viewModel::navigateToRegister,
                 iconResource = R.drawable.ic_plus_default,
                 containerColor = Red03
             )
@@ -94,19 +127,43 @@ fun AgencySearchScreen(
 private fun AgencySearchContentView(
     modifier: Modifier = Modifier,
     pagingItems: LazyPagingItems<Agency>,
-    onClickItem: (agencyId: Long) -> Unit
+    onClickItem: (agencyId: Long) -> Unit,
+    isLoading: Boolean,
+    isError: Boolean,
+    errorMessage: String,
+    fetchMyAgencyList: () -> Unit
 ) {
-    if (pagingItems.itemCount == 0) {
-        ContentViewWithoutAgencies(
-            modifier = modifier,
-            pagingItems = pagingItems
+    val contentLoading = pagingItems.loadState.refresh is LoadState.Loading || isLoading
+    val contentError = pagingItems.loadState.refresh is LoadState.Error || isError
+    val contentErrorMessage = errorMessage.ifEmpty {
+        (pagingItems.loadState.refresh as? LoadState.Error)?.error?.message
+            ?: MoneyMongError.UnExpectedError.message
+    }
+
+    if (contentLoading) {
+        LoadingScreen(modifier = modifier.fillMaxSize())
+    } else if (contentError) {
+        ErrorScreen(
+            modifier = modifier.fillMaxSize(),
+            message = contentErrorMessage,
+            onRetry = {
+                pagingItems.retry()
+                fetchMyAgencyList()
+            },
         )
     } else {
-        ContentViewWithAgencies(
-            modifier = modifier,
-            pagingItems = pagingItems,
-            onClickItem = onClickItem
-        )
+        if (pagingItems.itemCount == 0) {
+            ContentViewWithoutAgencies(
+                modifier = modifier,
+                pagingItems = pagingItems
+            )
+        } else {
+            ContentViewWithAgencies(
+                modifier = modifier,
+                pagingItems = pagingItems,
+                onClickItem = onClickItem
+            )
+        }
     }
 }
 
@@ -151,7 +208,7 @@ private fun ContentViewWithAgencies(
                 }
             }
 
-            else -> Unit
+            is LoadState.NotLoading -> Unit
         }
     }
 }
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchSideEffect.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchSideEffect.kt
@@ -0,0 +1,8 @@
+package com.moneymong.moneymong.feature.agency.search
+
+import com.moneymong.moneymong.common.base.SideEffect
+
+sealed interface AgencySearchSideEffect : SideEffect {
+    data object NavigateToRegister : AgencySearchSideEffect
+    data class NavigateToAgencyJoin(val agencyId: Long) : AgencySearchSideEffect
+}
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchState.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchState.kt
@@ -0,0 +1,15 @@
+package com.moneymong.moneymong.feature.agency.search
+
+import com.moneymong.moneymong.common.base.State
+
+data class AgencySearchState(
+    val joinedAgencies: List<Agency> = emptyList(),
+    val isLoading: Boolean = false,
+    val isError: Boolean = false,
+    val errorMessage: String = "",
+    val visibleWarningDialog: Boolean = false,
+) : State {
+
+    val joinedAgenciesIds: List<Long>
+        get() = joinedAgencies.map { it.id }
+}
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchViewModel.kt
@@ -1,23 +1,71 @@
 package com.moneymong.moneymong.feature.agency.search
 
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
 import androidx.paging.map
+import com.moneymong.moneymong.common.base.BaseViewModel
+import com.moneymong.moneymong.common.error.MoneyMongError
+import com.moneymong.moneymong.domain.usecase.agency.FetchMyAgencyListUseCase
 import com.moneymong.moneymong.domain.usecase.agency.GetAgenciesUseCase
-import com.moneymong.moneymong.feature.agency.toAgency
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.map
+import org.orbitmvi.orbit.syntax.simple.intent
+import org.orbitmvi.orbit.syntax.simple.reduce
 import javax.inject.Inject
 
 @HiltViewModel
 class AgencySearchViewModel @Inject constructor(
     getAgenciesUseCase: GetAgenciesUseCase,
-) : ViewModel() {
+    private val fetchMyAgencyListUseCase: FetchMyAgencyListUseCase
+) : BaseViewModel<AgencySearchState, AgencySearchSideEffect>(AgencySearchState()) {
 
-    val agencies = getAgenciesUseCase().cachedIn(viewModelScope).map { pagingData ->
+    fun navigateToRegister() =
+        eventEmit(sideEffect = AgencySearchSideEffect.NavigateToRegister)
+
+    fun navigateToJoin(agencyId: Long) =
+        eventEmit(sideEffect = AgencySearchSideEffect.NavigateToAgencyJoin(agencyId))
+
+    val agencies = getAgenciesUseCase().map { pagingData ->
         pagingData.map {
             it.toAgency()
         }
+    }.cachedIn(viewModelScope)
+
+    init {
+        fetchMyAgencyList()
+    }
+
+    fun fetchMyAgencyList() = intent {
+        reduce {
+            state.copy(
+                isLoading = true,
+                isError = false
+            )
+        }
+        fetchMyAgencyListUseCase(Unit)
+            .also {
+                reduce { state.copy(isLoading = false) }
+            }
+            .onSuccess {
+                reduce {
+                    state.copy(
+                        joinedAgencies = it.map { myAgencyEntity -> myAgencyEntity.toAgency() }
+                    )
+                }
+            }.onFailure {
+                reduce {
+                    state.copy(
+                        isError = true,
+                        errorMessage = it.message ?: MoneyMongError.UnExpectedError.message,
+                    )
+                }
+            }
+    }
+
+
+    fun changeVisibleWarningDialog(visible: Boolean) = intent {
+        reduce {
+            state.copy(visibleWarningDialog = visible)
+        }
     }
 }
diff --git a/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/item/AgencyItem.kt b/feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/item/AgencyItem.kt
@@ -29,8 +29,8 @@ import com.moneymong.moneymong.design_system.theme.Gray02
 import com.moneymong.moneymong.design_system.theme.Gray05
 import com.moneymong.moneymong.design_system.theme.Gray09
 import com.moneymong.moneymong.design_system.theme.White
-import com.moneymong.moneymong.feature.agency.Agency
-import com.moneymong.moneymong.feature.agency.AgencyType
+import com.moneymong.moneymong.feature.agency.search.Agency
+import com.moneymong.moneymong.feature.agency.search.AgencyType
 
 @Composable
 fun AgencyItem(
diff --git a/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt b/feature/home/src/main/java/com/moneymong/moneymong/home/HomeScreen.kt
@@ -185,7 +185,10 @@ fun HomeScreen(
                 navigateToTermsOfUse = homeNavController::navigateTermsOfUse,
                 navigateToPrivacyPolicy = homeNavController::navigatePrivacyPolicy,
                 navigateToWithdrawal = homeNavController::navigateWithdrawal,
-                navigateToLogin = homeNavController::navigateLogin,
+                navigateToLogin = {
+                    homeNavController.clearBackStack(agencyRoute)
+                    homeNavController.navigateLogin()
+                },
                 navigateUp = homeNavController::navigateUp
             )
         }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ fun AgencyGetResponse.toEntity() = AgencyGetEntity(`
`12`	`12`	`type = when (type) {`
`13`	`13`	`"IN_SCHOOL_CLUB" -> AgencyGetEntity.AgencyType.CLUB`
`14`	`14`	`"STUDENT_COUNCIL" -> AgencyGetEntity.AgencyType.COUNCIL`
`15`		`-// else -> throw IllegalArgumentException("Unknown type: $type")`
`16`		`- else -> AgencyGetEntity.AgencyType.CLUB`
	`15`	`+ else -> throw IllegalArgumentException("Unknown type: $type")`
`17`	`16`	`}`
`18`	`17`	`)`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.moneymong.moneymong.feature.agency.register.complete`
`2`	`2`
	`3`	`+import androidx.activity.compose.BackHandler`
`3`	`4`	`import androidx.compose.foundation.Image`
`4`	`5`	`import androidx.compose.foundation.background`
`5`	`6`	`import androidx.compose.foundation.clickable`
`@@ -49,6 +50,8 @@ fun AgencyRegisterCompleteScreen(`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`
	`53`	`+ BackHandler { viewModel.navigateToAgencySearch() }`
	`54`	`+`
`52`	`55`	`Column(`
`53`	`56`	`modifier = modifier`
`54`	`57`	`.fillMaxSize()`