Skip to content

Commit b7dd415

Browse files
committed
moneymong-232 fix : agencyId 연결
1 parent bcb0c72 commit b7dd415

2 files changed

Lines changed: 18 additions & 14 deletions

File tree

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fun MemberScreen(
102102
LaunchedEffect(key1 = Unit) {
103103
viewModel.eventEmit(MemberSideEffect.GetInvitationCode(state.agencyId.toLong()))
104104
viewModel.eventEmit(MemberSideEffect.GetMemberLists(state.agencyId.toLong()))
105-
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit)) //TODO - 마이몽 유저 정보 조회 연결
105+
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit))
106106
}
107107

108108

@@ -157,9 +157,9 @@ fun MemberScreen(
157157
ErrorDialog(
158158
message = state.errorPopUpMessage,
159159
onConfirm = {
160-
viewModel.eventEmit(MemberSideEffect.GetInvitationCode(88)) //TODO - agencyId 연결
161-
viewModel.eventEmit(MemberSideEffect.GetMemberLists(88)) //TODO - agencyId 연결
162-
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit)) //TODO - 마이몽 유저 정보 조회 연결
160+
viewModel.eventEmit(MemberSideEffect.GetInvitationCode(state.agencyId.toLong()))
161+
viewModel.eventEmit(MemberSideEffect.GetMemberLists(state.agencyId.toLong()))
162+
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit))
163163
viewModel.visiblePopUpErrorChanged(false)
164164
}
165165
)
@@ -168,7 +168,8 @@ fun MemberScreen(
168168
MemberDialogView(
169169
onDismissRequest = {
170170
viewModel.onShowDialogChanged(false)
171-
viewModel.eventEmit(MemberSideEffect.BlockMemberAuthor(88, state.vertClickedUserId))
171+
viewModel.eventEmit(MemberSideEffect.BlockMemberAuthor(state.agencyId.toLong(), state.vertClickedUserId))
172+
172173
},
173174
onConfirmation = {
174175
viewModel.onShowDialogChanged(false)
@@ -295,21 +296,22 @@ fun MemberScreen(
295296
if (state.isStaffChecked && !state.isMemberChecked) {
296297
viewModel.eventEmit(
297298
MemberSideEffect.UpdateMemberAuthor(
298-
88,
299+
state.agencyId.toLong(),
299300
"STAFF",
300301
state.vertClickedUserId
301302
)
302-
) //TODO
303+
)
304+
303305
viewModel.isStaffCheckedChanged(false)
304306

305307
} else if (!state.isStaffChecked && state.isMemberChecked) {
306308
viewModel.eventEmit(
307309
MemberSideEffect.UpdateMemberAuthor(
308-
88,
310+
state.agencyId.toLong(),
309311
"MEMBER",
310312
state.vertClickedUserId
311313
)
312-
) //TODO
314+
)
313315
viewModel.isMemberCheckedChanged(false)
314316
}
315317
},
@@ -327,9 +329,9 @@ fun MemberScreen(
327329
modifier = Modifier.fillMaxSize(),
328330
message = state.errorMessage,
329331
onRetry = {
330-
viewModel.eventEmit(MemberSideEffect.GetInvitationCode(88)) //TODO - agencyId 연결
331-
viewModel.eventEmit(MemberSideEffect.GetMemberLists(88)) //TODO - agencyId 연결
332-
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit)) //TODO - 마이몽 유저 정보 조회 연결
332+
viewModel.eventEmit(MemberSideEffect.GetInvitationCode(state.agencyId.toLong()))
333+
viewModel.eventEmit(MemberSideEffect.GetMemberLists(state.agencyId.toLong()))
334+
viewModel.eventEmit(MemberSideEffect.GetMyInfo(Unit))
333335
viewModel.visibleErrorChanged(false)
334336
}
335337
)
@@ -349,6 +351,7 @@ fun MemberScreen(
349351
)
350352
MemberCardView(
351353
modifier = Modifier,
354+
agencyId = state.agencyId,
352355
memberList = state.memberList,
353356
memberMyInfoId = state.memberMyInfoId,
354357
memberMyInfo = state.memberMyInfo,
@@ -361,7 +364,7 @@ fun MemberScreen(
361364
)
362365
},
363366
invitationCode = state.invitationCode,
364-
isReInvitationCode = { viewModel.eventEmit(MemberSideEffect.GetReInvitationCode(it)) }, //TODO
367+
isReInvitationCode = { viewModel.eventEmit(MemberSideEffect.GetReInvitationCode(it)) },
365368
onCopyChange = { onCopyClick -> viewModel.onCopyClickChanged(onCopyClick) },
366369
)
367370

feature/member/src/main/java/com/example/member/component/MemberCardView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import com.moneymong.moneymong.domain.entity.member.AgencyUserEntity
3838
@Composable
3939
fun MemberCardView(
4040
modifier: Modifier = Modifier,
41+
agencyId: Int,
4142
memberList: List<AgencyUserEntity>,
4243
memberMyInfoId: Long,
4344
memberMyInfo: AgencyUserEntity,
@@ -142,7 +143,7 @@ fun MemberCardView(
142143
modifier = Modifier
143144
.padding(start = 10.dp)
144145
.noRippleClickable {
145-
isReInvitationCode(81) //TODO
146+
isReInvitationCode(agencyId.toLong())
146147
}
147148

148149
) {

0 commit comments

Comments
 (0)