diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js index 54b8fcf..9d62904 100644 --- a/src/containers/basis/group/BasisGroupContainer.js +++ b/src/containers/basis/group/BasisGroupContainer.js @@ -147,7 +147,7 @@ export const BasisGroupContainer = props => { const handlerSearch = () => { if (user?.cstmrSno) { dispatch(Actions.MY_LIST.request({ cstmrSno: user?.cstmrSno })); - dispatch(Actions.JOIN_LIST.request({ cstmrSno: user?.cstmrSno })); + dispatch(Actions.GROUP_MYLIST.request({ cstmrSno: user?.cstmrSno })); } }; diff --git a/src/containers/basis/group/BasisGroupDetailJoinContainer.js b/src/containers/basis/group/BasisGroupDetailJoinContainer.js index db7c099..b1804af 100644 --- a/src/containers/basis/group/BasisGroupDetailJoinContainer.js +++ b/src/containers/basis/group/BasisGroupDetailJoinContainer.js @@ -54,7 +54,6 @@ export const BasisGroupDetailJoinContainer = props => { ); } }, [user]); - useEffect(() => { }, [params]); diff --git a/src/modules/basis/group/actions/basisGroupAction.ts b/src/modules/basis/group/actions/basisGroupAction.ts index d56524c..36e804e 100644 --- a/src/modules/basis/group/actions/basisGroupAction.ts +++ b/src/modules/basis/group/actions/basisGroupAction.ts @@ -55,6 +55,12 @@ const GROUP_JOINLIST_REQUEST = 'basis/group/GROUP_JOINLIST_REQUEST'; const GROUP_JOINLIST_SUCCESS = 'basis/group/GROUP_JOINLIST_SUCCESS'; const GROUP_JOINLIST_FAILURE = 'basis/group/GROUP_JOINLIST_FAILURE'; +//# 나의 그룹 목록 조회 +const GROUP_MYLIST_REQUEST = 'basis/group/GROUP_MYLIST_REQUEST'; +const GROUP_MYLIST_SUCCESS = 'basis/group/GROUP_MYLIST_SUCCESS'; +const GROUP_MYLIST_FAILURE = 'basis/group/GROUP_MYLIST_FAILURE'; + + //# 그룹 가입처리 const GROUP_JOIN_REQUEST = 'basis/group/GROUP_JOIN_REQUEST'; const GROUP_JOIN_SUCCESS = 'basis/group/GROUP_JOIN_SUCCESS'; @@ -97,6 +103,12 @@ export const JOIN_LIST = createAsyncAction( JOIN_LIST_FAILURE )(); +export const GROUP_MYLIST = createAsyncAction( + GROUP_MYLIST_REQUEST, + GROUP_MYLIST_SUCCESS, + GROUP_MYLIST_FAILURE + )(); + export const GROUP_DETAIL = createAsyncAction( GROUP_DETAIL_REQUEST, GROUP_DETAIL_SUCCESS, @@ -137,6 +149,7 @@ export const GROUP_JOINLIST = createAsyncAction( GROUP_JOINLIST_FAILURE )(); + export const GROUP_JOIN = createAsyncAction( GROUP_JOIN_REQUEST, GROUP_JOIN_SUCCESS, @@ -188,7 +201,8 @@ const actions = { APPROVAL_LIST, APPROVAL_UPDATE, USER_LIST, - USER_UPDATE + USER_UPDATE, + GROUP_MYLIST }; export type GroupAction = ActionType; diff --git a/src/modules/basis/group/reducers/basisGroupReducer.ts b/src/modules/basis/group/reducers/basisGroupReducer.ts index 026284d..7a5672a 100644 --- a/src/modules/basis/group/reducers/basisGroupReducer.ts +++ b/src/modules/basis/group/reducers/basisGroupReducer.ts @@ -30,6 +30,17 @@ export const groupReducer = createReducer( // draft.joinListCount = count; }) ) + .handleAction(Actions.GROUP_MYLIST.success, (state, action) => + produce(state, draft => { + const { data, count } = action.payload; + + draft.joinList = data; + draft.joinListCount = count; + + // draft.joinList = data; + // draft.joinListCount = count; + }) + ) .handleAction(Actions.GROUP_CREATEID.success, (state, action) => produce(state, draft => { const result = action.payload; diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts index 8134796..a961c5c 100644 --- a/src/modules/basis/group/sagas/basisGroupSaga.ts +++ b/src/modules/basis/group/sagas/basisGroupSaga.ts @@ -81,6 +81,37 @@ function* listMyJoinSaga(action: ActionType) { } } +function* myJoinSaga(action: ActionType) { + try { + const params = action.payload; + + const res = yield call(Apis.groupAPI.listMyGroupJoin, params); + const { data, count, errorCode, errorMessage } = res; + + if (errorCode) { + // 오류메시지 호출 + yield put( + MessageActions.IS_ERROR({ + errorCode: errorCode, + errorMessage: '처리중 오류가 발생 하였습니다', + isHistoryBack: false, + isRefresh: false + }) + ); + + return; + } + + yield put( + Actions.GROUP_MYLIST.success({ + data: data, + count: count + }) + ); + } catch (error) { + yield put(Actions.GROUP_MYLIST.failure(error)); + } +} function* createIdSaga( action: ActionType ) { @@ -433,6 +464,7 @@ function* updateUserSaga( export function* basGroupSaga() { yield takeEvery(Actions.MY_LIST.request, listMyGroupSaga); yield takeEvery(Actions.JOIN_LIST.request, listMyJoinSaga); + yield takeEvery(Actions.GROUP_MYLIST.request, myJoinSaga); yield takeEvery(Actions.GROUP_DETAIL.request, detailGroupSaga); yield takeEvery(Actions.GROUP_CREATE.request, createGroupSaga); yield takeEvery(Actions.GROUP_UPDATE.request, updateGroupSaga);