Skip to content

Commit ee9b5fe

Browse files
HeonbyeongHeonbyeong
committed
develop fix: 에러 수정
1 parent 7450bab commit ee9b5fe

7 files changed

Lines changed: 78 additions & 50 deletions

File tree

‎.idea/deploymentTargetDropDown.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎data/src/main/java/com/moneymong/moneymong/data/repository/login/TokenRepositoryImpl.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ class TokenRepositoryImpl @Inject constructor(
2222
tokenUpdateFailed.emit(failed)
2323
}
2424

25-
override val tokenUpdateFailed = MutableSharedFlow<Boolean>(replay = 1)
26-
2725
override suspend fun getRefreshToken(): Result<String> {
2826
return localDataSource.getRefreshToken()
2927
}

‎feature/member/src/main/java/com/example/member/MemberScreen.kt‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,12 @@ fun MemberScreen(
168168
MemberDialogView(
169169
onDismissRequest = {
170170
viewModel.onShowDialogChanged(false)
171-
viewModel.eventEmit(MemberSideEffect.BlockMemberAuthor(state.agencyId.toLong(), state.vertClickedUserId))
171+
viewModel.eventEmit(
172+
MemberSideEffect.BlockMemberAuthor(
173+
state.agencyId.toLong(),
174+
state.vertClickedUserId
175+
)
176+
)
172177
},
173178
onConfirmation = {
174179
viewModel.onShowDialogChanged(false)
@@ -333,49 +338,51 @@ fun MemberScreen(
333338
viewModel.eventEmit(MemberSideEffect.GetMemberLists(state.agencyId.toLong()))
334339
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit))
335340
}
336-
Column(
337-
modifier = Modifier
338-
.fillMaxSize()
339-
.background(White)
340-
.padding(horizontal = MMHorizontalSpacing)
341-
) {
342-
Text(
343-
modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
344-
text = "나",
345-
style = Body3,
346-
color = Gray07
347-
)
348-
MemberCardView(
349-
modifier = Modifier,
350-
agencyId = state.agencyId,
351-
memberList = state.memberList,
352-
memberMyInfoId = state.memberMyInfoId,
353-
memberMyInfo = state.memberMyInfo,
354-
memberMyInfoChanged = { id, userId, nickname, agencyUserRole ->
355-
viewModel.memberMyInfoChanged(
356-
id,
357-
userId,
358-
nickname,
359-
agencyUserRole
360-
)
361-
},
362-
invitationCode = state.invitationCode,
363-
isReInvitationCode = { viewModel.eventEmit(MemberSideEffect.GetReInvitationCode(it)) }, //TODO
364-
onCopyChange = { onCopyClick -> viewModel.onCopyClickChanged(onCopyClick) },
365341
)
342+
Column(
343+
modifier = Modifier
344+
.fillMaxSize()
345+
.background(White)
346+
.padding(horizontal = MMHorizontalSpacing)
347+
) {
348+
Text(
349+
modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
350+
text = "나",
351+
style = Body3,
352+
color = Gray07
353+
)
354+
MemberCardView(
355+
modifier = Modifier,
356+
agencyId = state.agencyId,
357+
memberList = state.memberList,
358+
memberMyInfoId = state.memberMyInfoId,
359+
memberMyInfo = state.memberMyInfo,
360+
memberMyInfoChanged = { id, userId, nickname, agencyUserRole ->
361+
viewModel.memberMyInfoChanged(
362+
id,
363+
userId,
364+
nickname,
365+
agencyUserRole
366+
)
367+
},
368+
invitationCode = state.invitationCode,
369+
isReInvitationCode = { viewModel.eventEmit(MemberSideEffect.GetReInvitationCode(it)) }, //TODO
370+
onCopyChange = { onCopyClick -> viewModel.onCopyClickChanged(onCopyClick) },
371+
)
366372

367-
MemberListView(
368-
modifier = Modifier.padding(top = 24.dp),
369-
memberMyInfo = state.memberMyInfo,
370-
filteredMemberList = state.filteredMemberList,
371-
onIconClick = { vertClick -> viewModel.onVertClickChanged(vertClick) },
372-
updateFilteredMemberList = { memberMyInfoId ->
373-
viewModel.updateFilteredMemberList(
374-
memberMyInfoId
375-
)
376-
},
377-
vertClickedUserIdChanged = { userId -> viewModel.vertClickedUserIdChanged(userId) },
378-
)
373+
MemberListView(
374+
modifier = Modifier.padding(top = 24.dp),
375+
memberMyInfo = state.memberMyInfo,
376+
filteredMemberList = state.filteredMemberList,
377+
onIconClick = { vertClick -> viewModel.onVertClickChanged(vertClick) },
378+
updateFilteredMemberList = { memberMyInfoId ->
379+
viewModel.updateFilteredMemberList(
380+
memberMyInfoId
381+
)
382+
},
383+
vertClickedUserIdChanged = { userId -> viewModel.vertClickedUserIdChanged(userId) },
384+
)
385+
}
379386
} else {
380387
Column(
381388
modifier = Modifier
@@ -435,4 +442,4 @@ fun MemberScreen(
435442
}
436443
}
437444
}
438-
}
445+
}

‎feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/main/MyMongViewModel.kt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package com.moneymong.moneymong.feature.mymong.main
22

33
import com.moneymong.moneymong.common.base.BaseViewModel
44
import com.moneymong.moneymong.common.error.MoneyMongError
5+
import com.moneymong.moneymong.domain.usecase.agency.SaveAgencyIdUseCase
56
import com.moneymong.moneymong.domain.usecase.user.GetMyInfoUseCase
67
import com.moneymong.moneymong.domain.usecase.user.LogoutUseCase
8+
import com.moneymong.moneymong.domain.usecase.user.SaveUserIdUseCase
79
import dagger.hilt.android.lifecycle.HiltViewModel
810
import org.orbitmvi.orbit.syntax.simple.intent
911
import org.orbitmvi.orbit.syntax.simple.postSideEffect
@@ -13,7 +15,9 @@ import javax.inject.Inject
1315
@HiltViewModel
1416
class MyMongViewModel @Inject constructor(
1517
private val getMyInfoUseCase: GetMyInfoUseCase,
16-
private val logoutUseCase: LogoutUseCase
18+
private val logoutUseCase: LogoutUseCase,
19+
private val saveAgencyIdUseCase: SaveAgencyIdUseCase,
20+
private val saveUserIdUseCase: SaveUserIdUseCase
1721
) : BaseViewModel<MyMongState, MyMongSideEffect>(MyMongState()) {
1822

1923
fun navigateToTermsOfUse() =
@@ -63,6 +67,7 @@ class MyMongViewModel @Inject constructor(
6367
fun logout() = intent {
6468
logoutUseCase(data = Unit)
6569
.onSuccess {
70+
clearLocalData()
6671
postSideEffect(sideEffect = MyMongSideEffect.NavigateToLogin)
6772
}.onFailure {
6873
reduce {
@@ -86,4 +91,9 @@ class MyMongViewModel @Inject constructor(
8691
state.copy(visibleErrorDialog = visible)
8792
}
8893
}
94+
95+
private fun clearLocalData() = intent {
96+
saveAgencyIdUseCase(0)
97+
saveUserIdUseCase(0)
98+
}
8999
}

‎feature/mymong/src/main/java/com/moneymong/moneymong/feature/mymong/withdrawal/WithdrawalViewModel.kt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package com.moneymong.moneymong.feature.mymong.withdrawal
22

33
import com.moneymong.moneymong.common.base.BaseViewModel
44
import com.moneymong.moneymong.common.error.MoneyMongError
5+
import com.moneymong.moneymong.domain.usecase.agency.SaveAgencyIdUseCase
6+
import com.moneymong.moneymong.domain.usecase.user.SaveUserIdUseCase
57
import com.moneymong.moneymong.domain.usecase.user.WithdrawalUseCase
68
import dagger.hilt.android.lifecycle.HiltViewModel
79
import org.orbitmvi.orbit.syntax.simple.intent
@@ -11,12 +13,15 @@ import javax.inject.Inject
1113

1214
@HiltViewModel
1315
class WithdrawalViewModel @Inject constructor(
14-
private val withdrawalUseCase: WithdrawalUseCase
16+
private val withdrawalUseCase: WithdrawalUseCase,
17+
private val saveAgencyIdUseCase: SaveAgencyIdUseCase,
18+
private val saveUserIdUseCase: SaveUserIdUseCase
1519
) : BaseViewModel<WithdrawalState, WithdrawalSideEffect>(WithdrawalState()) {
1620

1721
fun withdrawal() = intent {
1822
withdrawalUseCase(data = Unit)
1923
.onSuccess {
24+
clearLocalData()
2025
postSideEffect(WithdrawalSideEffect.NavigateToLogin)
2126
}.onFailure {
2227
reduce {
@@ -46,4 +51,9 @@ class WithdrawalViewModel @Inject constructor(
4651
state.copy(visibleErrorDialog = visible)
4752
}
4853
}
54+
55+
private fun clearLocalData() = intent {
56+
saveAgencyIdUseCase(0)
57+
saveUserIdUseCase(0)
58+
}
4959
}

‎feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/state/LoginState.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ data class LoginState(
66
val isClickable: Boolean = false,
77
val isSchoolInfoExist: Boolean? = null,
88
val isLoginRequired: Boolean? = null,
9-
val visibleError : Boolean? = null,
9+
val visibleError : Boolean = false,
1010
val errorMessage : String = ""
1111
) : State

‎feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import com.moneymong.moneymong.feature.sign.sideeffect.LoginSideEffect
1313
import com.moneymong.moneymong.feature.sign.state.LoginState
1414
import com.moneymong.moneymong.network.util.TokenCallback
1515
import kotlinx.coroutines.launch
16+
import org.orbitmvi.orbit.annotation.OrbitExperimental
17+
import org.orbitmvi.orbit.syntax.simple.blockingIntent
1618
import org.orbitmvi.orbit.syntax.simple.intent
1719
import org.orbitmvi.orbit.syntax.simple.reduce
1820
import javax.inject.Inject
@@ -80,7 +82,8 @@ class LoginViewModel @Inject constructor(
8082
}
8183
}
8284

83-
fun fetchMyInfo() = intent {
85+
@OptIn(OrbitExperimental::class)
86+
fun fetchMyInfo() = blockingIntent {
8487
getMyInfoUseCase(Unit)
8588
.onSuccess {
8689
saveUserIdUseCase(it.id.toInt())

0 commit comments

Comments
 (0)