Browse Source

[api꼬임 수정]나의그룹 - 참여그룹목록

pull/2/head
junh_eee(이준희) 2 years ago
parent
commit
55b6ce23b3
  1. 9
      src/containers/basis/group/BasisGroupContainer.js
  2. 2
      src/modules/basis/group/actions/basisGroupAction.ts
  3. 2
      src/modules/basis/group/apis/basisGroupApi.ts
  4. 5
      src/modules/basis/group/models/basisGroupModel.ts
  5. 2
      src/modules/basis/group/reducers/basisGroupReducer.ts
  6. 2
      src/modules/basis/group/sagas/basisGroupSaga.ts

9
src/containers/basis/group/BasisGroupContainer.js

@ -9,7 +9,7 @@ import { ConfirmModal } from '../../../components/modal/ConfirmModal';
import * as Actions from '../../../modules/basis/group/actions/basisGroupAction'; import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
export const BasisGroupContainer = props => { export const BasisGroupContainer = props => {
const { myList, myListCount, mainList, mainListCount } = useSelector( const { myList, myListCount, joinList, joinListCount } = useSelector(
state => state.groupState state => state.groupState
); );
@ -161,7 +161,8 @@ export const BasisGroupContainer = props => {
const handlerSearch = () => { const handlerSearch = () => {
if (user?.cstmrSno) { if (user?.cstmrSno) {
dispatch(Actions.MY_LIST.request({ cstmrSno: user?.cstmrSno })); dispatch(Actions.MY_LIST.request({ cstmrSno: user?.cstmrSno }));
dispatch(Actions.GROUP_MAIN_LIST.request({ cstmrSno: user?.cstmrSno })); // dispatch(Actions.GROUP_MAIN_LIST.request({ cstmrSno: user?.cstmrSno }));
dispatch(Actions.JOIN_LIST.request({ cstmrSno: user?.cstmrSno }));
} }
}; };
@ -207,10 +208,10 @@ export const BasisGroupContainer = props => {
/> />
<BasisGroupJoinGrid <BasisGroupJoinGrid
data={mainList} data={joinList}
title={'참여 그룹'} title={'참여 그룹'}
columns={joinColumns} columns={joinColumns}
count={mainListCount} count={joinListCount}
handlerGroupJoin={handlerGroupJoin} handlerGroupJoin={handlerGroupJoin}
pagination={false} pagination={false}
/> />

2
src/modules/basis/group/actions/basisGroupAction.ts

@ -33,7 +33,7 @@ const GROUP_CREATE_REQUEST = 'basis/group/GROUP_CREATE_REQUEST';
const GROUP_CREATE_SUCCESS = 'basis/group/GROUP_CREATE_SUCCESS'; const GROUP_CREATE_SUCCESS = 'basis/group/GROUP_CREATE_SUCCESS';
const GROUP_CREATE_FAILURE = 'basis/group/GROUP_CREATE_FAILURE'; const GROUP_CREATE_FAILURE = 'basis/group/GROUP_CREATE_FAILURE';
//## 그룹수정 //## 그룹 수정
const GROUP_UPDATE_REQUEST = 'basis/group/GROUP_UPDATE_REQUEST'; const GROUP_UPDATE_REQUEST = 'basis/group/GROUP_UPDATE_REQUEST';
const GROUP_UPDATE_SUCCESS = 'basis/group/GROUP_UPDATE_SUCCESS'; const GROUP_UPDATE_SUCCESS = 'basis/group/GROUP_UPDATE_SUCCESS';
const GROUP_UPDATE_FAILURE = 'basis/group/GROUP_UPDATE_FAILURE'; const GROUP_UPDATE_FAILURE = 'basis/group/GROUP_UPDATE_FAILURE';

2
src/modules/basis/group/apis/basisGroupApi.ts

@ -25,7 +25,7 @@ export const groupAPI = {
}); });
return await axios.get(`api/bas/group/joinlist${queryString}`); return await axios.get(`api/bas/group/joinlist${queryString}`);
}, },
Grouplist: async (data: string) => { grouplist: async (data: string) => {
const queryString = qs.stringify(data, { const queryString = qs.stringify(data, {
addQueryPrefix: true, addQueryPrefix: true,
arrayFormat: 'repeat' arrayFormat: 'repeat'

5
src/modules/basis/group/models/basisGroupModel.ts

@ -9,7 +9,7 @@ export interface GroupState {
mainList: MainGroupData[] | undefined; mainList: MainGroupData[] | undefined;
mainListCount: number | 0; mainListCount: number | 0;
groupList: GroupData[] | undefined; groupList: GroupData[] | undefined;
groupCount: number | 0; groupListCount: number | 0;
aprvList: AprvGroupData[] | undefined; aprvList: AprvGroupData[] | undefined;
aprvCount: number | 0; aprvCount: number | 0;
userList: UserGroupData[] | undefined; userList: UserGroupData[] | undefined;
@ -34,6 +34,7 @@ export interface GroupData {
createDt: Date; createDt: Date;
updateDt: Date; updateDt: Date;
} }
export interface SelectData { export interface SelectData {
groupId: string; groupId: string;
groupNm: string; groupNm: string;
@ -107,7 +108,7 @@ export const initGroup = {
mainList: undefined, mainList: undefined,
mainListCount: 0, mainListCount: 0,
groupList: undefined, groupList: undefined,
groupCount: 0, groupListCount: 0,
aprvList: undefined, aprvList: undefined,
aprvCount: 0, aprvCount: 0,
userList: undefined, userList: undefined,

2
src/modules/basis/group/reducers/basisGroupReducer.ts

@ -74,7 +74,7 @@ export const groupReducer = createReducer<GroupState, Actions.GroupAction>(
produce(state, draft => { produce(state, draft => {
const { data, count } = action.payload; const { data, count } = action.payload;
draft.groupList = data; draft.groupList = data;
draft.groupCount = count; draft.groupListCount = count;
}) })
) )
.handleAction(Actions.GROUP_JOINLIST.success, (state, action) => .handleAction(Actions.GROUP_JOINLIST.success, (state, action) =>

2
src/modules/basis/group/sagas/basisGroupSaga.ts

@ -86,7 +86,7 @@ function* GrouplistSaga(
try { try {
const params = action.payload; const params = action.payload;
const res = yield call(Apis.groupAPI.Grouplist, params); const res = yield call(Apis.groupAPI.grouplist, params);
const { data, count, errorCode, errorMessage } = res; const { data, count, errorCode, errorMessage } = res;
if (errorCode) { if (errorCode) {
// 오류메시지 호출 // 오류메시지 호출

Loading…
Cancel
Save