This commit is contained in:
focp212@naver.com
2025-09-25 09:18:24 +09:00
40 changed files with 1798 additions and 461 deletions

View File

@@ -12,6 +12,8 @@ export enum AccountUserTabKeys {
export interface AccountUserTabProps {
activeTab: AccountUserTabKeys;
tid: string;
mid?: string;
usrid?: string;
};
export interface AuthItem {
useYn?: boolean;
@@ -19,13 +21,16 @@ export interface AuthItem {
tid?: string;
};
export interface UserManageAuthListProps {
authItems: Array<AuthItem>
userItems: Array<any>;
mid: string;
};
export interface UserManageAuthItemProps extends AuthItem {
usrid?: string;
mid?: string;
};
export interface UserLoginAuthInfoWrapProps {
tid: string;
mid: string;
usrid: string;
};
export interface UserAccountAuthWrapProps {
tid: string;
@@ -40,4 +45,72 @@ export interface UserAccountAuthPermListProps {
};
export interface UserAccountAuthPermItemProps extends PermItem {
tid: string;
};
};
export interface VerificationItem {
type: string;
contact: string;
}
export interface UserCreateRequest {
mid: string;
usrid: string;
password?: string;
loginRange: string;
verifications: Array<VerificationItem>;
}
export interface UserCreateResponse {
status: boolean;
error?: {
root: string;
errKey: string;
code: string;
message: string;
timestamp: string;
details: Record<string, string>;
};
data?: {
user: {
usrid: string;
mid: string;
gid: string;
aid: string;
pw: string;
authCd: string;
status: string;
regDt: string;
memo: string;
changeDt: string;
failCnt: number;
oldPw1: string;
oldPw2: string;
oldPw3: string;
oldPw4: string;
worker: string;
loginCd: string;
pwWorkIp: string;
pwCheckYn: string;
loginFailDt: string;
loginFailTm: string;
loginFailIp: string;
desaYn: string;
desaAccType: string;
desaAccIp: string;
desaProcType: string;
desaFormat: string;
desaSvcCl: string;
emailAuth1: string;
emailAuth2: string;
emailAuth3: string;
authDt: string;
authTm: string;
userAidGroupYn: string;
userAidGroupId: string;
subNm: string;
subLevel: string;
multiAccessYn: string;
duplicateAccessYn: string;
};
};
}

View File

@@ -7,7 +7,9 @@ import {
export const AccountUserTab = ({
activeTab,
tid
tid,
mid,
usrid
}: AccountUserTabProps) => {
const { navigate } = useNavigate();
@@ -16,14 +18,18 @@ export const AccountUserTab = ({
if(tab === AccountUserTabKeys.LoginAuthInfo){
navigate(PATHS.account.user.loginAuthInfo, {
state: {
tid: tid
tid: tid,
mid: mid,
usrid: usrid
}
});
}
else if(tab === AccountUserTabKeys.AccountAuth){
navigate(PATHS.account.user.accountAuth, {
state: {
tid: tid
tid: tid,
mid: mid,
usrid: usrid
}
});
}

View File

@@ -1,8 +1,268 @@
import { UserLoginAuthInfoWrapProps } from '../model/types';
import { UserFindAuthMethodParams, UserAuthMethodData } from '@/entities/user/model/types';
import { useUserFindAuthMethodMutation } from '@/entities/user/api/use-user-find-authmethod-mutation';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { useEffect, useState } from 'react';
export const UserLoginAuthInfoWrap = ({
tid
}: UserLoginAuthInfoWrapProps) => {
mid,
usrid,
}: UserFindAuthMethodParams) => {
const { mutateAsync: userFindAuthMethod } = useUserFindAuthMethodMutation();
const [pageParam] = useState(DEFAULT_PAGE_PARAM);
const [authMethodData, setAuthMethodData] = useState<UserAuthMethodData>();
const [initialData, setInitialData] = useState<UserAuthMethodData>();
const [newEmails, setNewEmails] = useState<string[]>([]);
const [newPhones, setNewPhones] = useState<string[]>([]);
const [editableEmailIndex, setEditableEmailIndex] = useState<number>(-1);
const [editablePhoneIndex, setEditablePhoneIndex] = useState<number>(-1);
const [readOnlyEmails, setReadOnlyEmails] = useState<Set<number>>(new Set());
const [readOnlyPhones, setReadOnlyPhones] = useState<Set<number>>(new Set());
const handleRemoveExistingEmail = (index: number) => {
if (authMethodData?.emails) {
const updatedEmails = authMethodData.emails.filter((_, i) => i !== index);
setAuthMethodData({ ...authMethodData, emails: updatedEmails });
}
};
const handleRemoveExistingPhone = (index: number) => {
if (authMethodData?.phones) {
const updatedPhones = authMethodData.phones.filter((_, i) => i !== index);
setAuthMethodData({ ...authMethodData, phones: updatedPhones });
}
};
const callUserFindAuthMethod = (mid: string, usrid: string) => {
let params: UserFindAuthMethodParams = {
mid: mid,
usrid: usrid,
page: pageParam
};
userFindAuthMethod(params).then((rs: any) => {
console.log("User Find Auth Method: ", rs);
// API 응답이 직접 데이터를 반환하는 경우
if (rs.emails || rs.phones) {
console.log("Setting authMethodData directly from response: ", rs);
setAuthMethodData(rs);
setInitialData(rs);
}
// API 응답이 data 프로퍼티 안에 있는 경우
else if (rs.data) {
console.log("Setting authMethodData from rs.data: ", rs.data);
setAuthMethodData(rs.data);
setInitialData(rs.data);
}
});
};
useEffect(() => {
if (mid && usrid) {
callUserFindAuthMethod(mid, usrid);
}
}, [mid, usrid]);
const handleAddEmail = () => {
// 현재 편집 중인 항목을 읽기전용으로 고정
if (editableEmailIndex >= 0) {
setReadOnlyEmails(prev => new Set([...prev, editableEmailIndex]));
}
// 새로운 편집 가능한 항목 추가
setEditableEmailIndex(newEmails.length);
setNewEmails([...newEmails, '']);
};
const handleAddPhone = () => {
// 현재 편집 중인 항목을 읽기전용으로 고정
if (editablePhoneIndex >= 0) {
setReadOnlyPhones(prev => new Set([...prev, editablePhoneIndex]));
}
// 새로운 편집 가능한 항목 추가
setEditablePhoneIndex(newPhones.length);
setNewPhones([...newPhones, '']);
};
const handleRemoveNewEmail = (index: number) => {
const updatedEmails = newEmails.filter((_, i) => i !== index);
setNewEmails(updatedEmails);
// 읽기전용 인덱스들을 업데이트 (삭제된 인덱스보다 큰 인덱스들은 1씩 감소)
const updatedReadOnlyEmails = new Set<number>();
readOnlyEmails.forEach(readOnlyIndex => {
if (readOnlyIndex < index) {
updatedReadOnlyEmails.add(readOnlyIndex);
} else if (readOnlyIndex > index) {
updatedReadOnlyEmails.add(readOnlyIndex - 1);
}
// readOnlyIndex === index인 경우 제거됨 (Set에 추가하지 않음)
});
setReadOnlyEmails(updatedReadOnlyEmails);
// 삭제 후 편집 가능한 인덱스 조정
if (index === editableEmailIndex) {
// 현재 편집 중인 항목을 삭제한 경우 - 편집 가능한 항목이 없음
setEditableEmailIndex(-1);
} else if (index < editableEmailIndex) {
// 편집 가능한 항목보다 앞의 항목을 삭제한 경우
setEditableEmailIndex(editableEmailIndex - 1);
}
};
const handleRemoveNewPhone = (index: number) => {
const updatedPhones = newPhones.filter((_, i) => i !== index);
setNewPhones(updatedPhones);
// 읽기전용 인덱스들을 업데이트 (삭제된 인덱스보다 큰 인덱스들은 1씩 감소)
const updatedReadOnlyPhones = new Set<number>();
readOnlyPhones.forEach(readOnlyIndex => {
if (readOnlyIndex < index) {
updatedReadOnlyPhones.add(readOnlyIndex);
} else if (readOnlyIndex > index) {
updatedReadOnlyPhones.add(readOnlyIndex - 1);
}
// readOnlyIndex === index인 경우 제거됨 (Set에 추가하지 않음)
});
setReadOnlyPhones(updatedReadOnlyPhones);
// 삭제 후 편집 가능한 인덱스 조정
if (index === editablePhoneIndex) {
// 현재 편집 중인 항목을 삭제한 경우 - 편집 가능한 항목이 없음
setEditablePhoneIndex(-1);
} else if (index < editablePhoneIndex) {
// 편집 가능한 항목보다 앞의 항목을 삭제한 경우
setEditablePhoneIndex(editablePhoneIndex - 1);
}
};
const handleNewEmailChange = (index: number, value: string) => {
const updated = [...newEmails];
updated[index] = value;
setNewEmails(updated);
};
const handleNewPhoneChange = (index: number, value: string) => {
const updated = [...newPhones];
updated[index] = value;
setNewPhones(updated);
};
// 이메일 형식 검증
const isValidEmail = (email: string) => {
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
return emailRegex.test(email);
};
// 전화번호 형식 검증 (010으로 시작하고 총 11자리 숫자)
const isValidPhone = (phone: string) => {
const phoneRegex = /^010\d{8}$/;
return phoneRegex.test(phone);
};
// 이메일 추가 버튼 활성화 조건
const isEmailAddButtonEnabled = () => {
if (newEmails.length === 0) return true; // 처음은 활성화
const lastEmailIndex = newEmails.length - 1;
const lastEmail = newEmails[lastEmailIndex];
// 마지막 항목이 편집 가능하고, 유효한 형식이며, 중복이 없으면 활성화
return lastEmailIndex >= editableEmailIndex &&
lastEmail &&
lastEmail.trim() &&
isValidEmail(lastEmail) &&
!hasDuplicateEmail();
};
// 전화번호 추가 버튼 활성화 조건
const isPhoneAddButtonEnabled = () => {
if (newPhones.length === 0) return true; // 처음은 활성화
const lastPhoneIndex = newPhones.length - 1;
const lastPhone = newPhones[lastPhoneIndex];
// 마지막 항목이 편집 가능하고, 유효한 형식이며, 중복이 없으면 활성화
return lastPhoneIndex >= editablePhoneIndex &&
lastPhone &&
lastPhone.trim() &&
isValidPhone(lastPhone) &&
!hasDuplicatePhone();
};
// 삭제 버튼 활성화 조건 (전체 항목이 1개만 남으면 비활성화)
const isDeleteButtonEnabled = () => {
const totalEmailCount = (authMethodData?.emails?.length || 0) + newEmails.length;
const totalPhoneCount = (authMethodData?.phones?.length || 0) + newPhones.length;
const totalCount = totalEmailCount + totalPhoneCount;
return totalCount > 1;
};
// 중복 이메일 검증
const hasDuplicateEmail = () => {
const allEmails = [
...(authMethodData?.emails?.map(e => e.content) || []),
...newEmails.filter(e => e.trim())
];
const uniqueEmails = new Set(allEmails);
return allEmails.length !== uniqueEmails.size;
};
// 중복 전화번호 검증
const hasDuplicatePhone = () => {
const allPhones = [
...(authMethodData?.phones?.map(p => p.content) || []),
...newPhones.filter(p => p.trim())
];
const uniquePhones = new Set(allPhones);
return allPhones.length !== uniquePhones.size;
};
const isSaveButtonEnabled = () => {
// 새로 추가된 이메일 중 값이 있는 것들의 형식 검증
const validNewEmails = newEmails.filter(e => e.trim());
const hasInvalidEmail = validNewEmails.some(email => !isValidEmail(email));
// 새로 추가된 전화번호 중 값이 있는 것들의 형식 검증
const validNewPhones = newPhones.filter(p => p.trim());
const hasInvalidPhone = validNewPhones.some(phone => !isValidPhone(phone));
// 형식이 맞지 않는 항목이 있거나 중복이 있으면 비활성화
if (hasInvalidEmail || hasInvalidPhone || hasDuplicateEmail() || hasDuplicatePhone()) {
return false;
}
// 현재 이메일과 전화번호가 모두 없으면 비활성화
const currentEmailCount = (authMethodData?.emails?.length || 0) + validNewEmails.length;
const currentPhoneCount = (authMethodData?.phones?.length || 0) + validNewPhones.length;
if (currentEmailCount === 0 && currentPhoneCount === 0) {
return false;
}
// 초기 데이터와 비교하여 변경사항이 있는지 확인
const initialEmailCount = initialData?.emails?.length || 0;
const initialPhoneCount = initialData?.phones?.length || 0;
const currentApiEmailCount = authMethodData?.emails?.length || 0;
const currentApiPhoneCount = authMethodData?.phones?.length || 0;
// 삭제가 발생했거나 새로운 항목이 추가된 경우 활성화
const hasChanges = (
currentApiEmailCount < initialEmailCount ||
currentApiPhoneCount < initialPhoneCount ||
validNewEmails.length > 0 ||
validNewPhones.length > 0
);
return hasChanges;
};
console.log("Rendering with authMethodData: ", authMethodData);
console.log("Emails: ", authMethodData?.emails);
console.log("Phones: ", authMethodData?.phones);
return (
<>
@@ -11,88 +271,107 @@ export const UserLoginAuthInfoWrap = ({
<div className="group">
<div className="group-header">
<div className="title"> </div>
<button
className="ic20 plus"
type="button"
<button
className="ic20 plus"
type="button"
aria-label="추가"
onClick={handleAddEmail}
disabled={!isEmailAddButtonEnabled()}
></button>
</div>
<div className="input-row">
<input
type="text"
value="nicetest01@nicepay.co.kr"
placeholder="example@domain.com"
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
></button>
</div>
<div className="input-row">
<input
type="text"
value="nicetest01@nicepay.co.kr"
placeholder="example@domain.com"
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
></button>
</div>
<div className="input-row">
<input
type="text"
placeholder="example@domain.com"
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
></button>
</div>
{authMethodData?.emails && authMethodData.emails.length > 0 && authMethodData.emails.map((email, index) => (
<div className="input-row" key={`existing-email-${index}`}>
<input
type="text"
value={email.content}
placeholder="example@domain.com"
readOnly
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
onClick={() => handleRemoveExistingEmail(index)}
disabled={!isDeleteButtonEnabled()}
></button>
</div>
))}
{newEmails.map((email, index) => (
<div className="input-row" key={`new-email-${index}`}>
<input
type="text"
value={email}
placeholder="example@domain.com"
onChange={(e) => handleNewEmailChange(index, e.target.value)}
readOnly={readOnlyEmails.has(index) || index !== editableEmailIndex}
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
onClick={() => handleRemoveNewEmail(index)}
disabled={!isDeleteButtonEnabled()}
></button>
</div>
))}
</div>
<div className="group">
<div className="group-header">
<div className="title"> </div>
<button
className="ic20 plus"
type="button"
<button
className="ic20 plus"
type="button"
aria-label="추가"
onClick={handleAddPhone}
disabled={!isPhoneAddButtonEnabled()}
></button>
</div>
<div className="input-row">
<input
type="text"
value="01012345678"
placeholder="휴대폰 번호 입력"
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
></button>
</div>
<div className="input-row">
<input
type="text"
value="01012345678"
placeholder="휴대폰 번호 입력"
readOnly={ true }
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
></button>
</div>
{authMethodData?.phones && authMethodData.phones.length > 0 && authMethodData.phones.map((phone, index) => (
<div className="input-row" key={`existing-phone-${index}`}>
<input
type="text"
value={phone.content}
placeholder="휴대폰 번호 입력"
readOnly
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
onClick={() => handleRemoveExistingPhone(index)}
disabled={!isDeleteButtonEnabled()}
></button>
</div>
))}
{newPhones.map((phone, index) => (
<div className="input-row" key={`new-phone-${index}`}>
<input
type="text"
value={phone}
placeholder="휴대폰 번호 입력"
onChange={(e) => handleNewPhoneChange(index, e.target.value)}
readOnly={readOnlyPhones.has(index) || index !== editablePhoneIndex}
/>
<button
className="icon-btn minus"
type="button"
aria-label="삭제"
onClick={() => handleRemoveNewPhone(index)}
disabled={!isDeleteButtonEnabled()}
></button>
</div>
))}
<div className="notice-bar"> .</div>
</div>
</div>
<div className="apply-row bottom-padding">
<button className="btn-50 btn-blue flex-1"></button>
<button
className="btn-50 btn-blue flex-1"
disabled={!isSaveButtonEnabled()}
>
</button>
</div>
</div>
</>

View File

@@ -3,16 +3,19 @@ import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { UserManageAuthItemProps } from '../model/types';
export const UserManageAuthItem = ({
useYn,
authName,
tid
usrid,
tid,
mid,
}: UserManageAuthItemProps) => {
const { navigate } = useNavigate();
const onClickToNavigation = () => {
// state를 통해 데이터 전달
navigate(PATHS.account.user.loginAuthInfo, {
state: {
tid: tid
tid: tid,
mid: mid,
usrid: usrid
}
});
};
@@ -23,8 +26,8 @@ export const UserManageAuthItem = ({
onClick={ () => onClickToNavigation() }
>
<div className="auth-item-left">
<span className={ `tag-pill ${(!!useYn)? '': 'red'}` }>{ (!!useYn)? '사용': '미사용' }</span>
<span className="auth-name">{ authName }</span>
{/* <span className={ `tag-pill ${(!!useYn)? '': 'red'}` }>{ (!!useYn)? '사용': '미사용' }</span> */}
<span className="auth-name">{ usrid }</span>
</div>
<span className="ic20 arrow-right"></span>
</div>

View File

@@ -2,18 +2,19 @@ import { UserManageAuthItem } from './user-manage-auth-item';
import { UserManageAuthListProps } from '../model/types';
export const UserManageAuthList = ({
authItems
userItems,
mid
}: UserManageAuthListProps) => {
const getUserManageAuthItems = () => {
let rs = [];
for(let i=0;i<authItems.length;i++){
for(let i=0;i<userItems.length;i++){
rs.push(
<UserManageAuthItem
key={ 'UserManageAuthItem-key-' + i }
useYn={ authItems[i]?.useYn }
authName= { authItems[i]?.authName }
tid= { authItems[i]?.tid }
key={ userItems[i]?.usrid }
usrid={ userItems[i]?.usrid }
tid={ userItems[i]?.tid }
mid={ mid }
></UserManageAuthItem>
);
}

View File

@@ -2,21 +2,29 @@ import { useEffect, useState } from 'react';
import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { AuthItem } from '../model/types';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { UserManageAuthList } from './user-manage-auth-list';
import { useUserFindMutation } from '@/entities/user/api/use-user-find-mutation';
import { UserListItem } from '@/entities/user/model/types';
export const UserManageWrap = () => {
const { navigate } = useNavigate();
const { mutateAsync: userFind } = useUserFindMutation();
const [userItems, setUserItems] = useState<Array<UserListItem>>([]);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [authItems, setAuthItems] = useState<Array<AuthItem>>([]);
const midList = [
{ value: 'nictest00m', label: 'nictest00m' },
{ value: 'nictest01m', label: 'nictest01m' },
{ value: 'nictest02m', label: 'nictest02m' },
];
const callAuthList = () => {
setAuthItems([
{useYn: true, authName: 'test01', tid: 'A12334556'},
{useYn: true, authName: 'test02', tid: 'A33334556'},
{useYn: true, authName: 'test03', tid: 'A12345556'},
{useYn: true, authName: 'test04', tid: 'A12978676'},
{useYn: false, authName: 'test05', tid: 'A12344444'},
]);
const callList = (mid: string) => {
setPageParam(pageParam);
userFind({ mid: mid, page: pageParam }).then((rs) => {
setUserItems(rs.content || []);
});
};
const onClickToNavigation = () => {
@@ -24,21 +32,25 @@ export const UserManageWrap = () => {
};
useEffect(() => {
callAuthList();
}, []);
callList(mid);
}, [mid]);
return (
<>
<div className="ing-list">
<div className="input-wrapper top-select mt-16">
<select>
<option>nicetest00m</option>
<select value={mid} onChange={e => setMid(e.target.value)}>
{midList.map(item => (
<option key={item.value} value={item.value}>{item.label}</option>
))}
</select>
</div>
<div className="ing-title"> </div>
{ (!!authItems && authItems.length > 0) &&
{ (!!userItems && userItems.length > 0) &&
<UserManageAuthList
authItems={ authItems }
userItems={ userItems }
mid={ mid }
></UserManageAuthList>
}
<div className="apply-row bottom-padding">

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDetailParams,
ExtensionSmsDetailResponse
} from '../../model/types';
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions
@@ -17,7 +17,7 @@ export const extensionSmsDetail = (params: ExtensionSmsDetailParams) => {
);
};
export const useExtensionSmsListMutation = (options?: UseMutationOptions<ExtensionSmsDetailResponse, CBDCAxiosError, ExtensionSmsDetailParams>) => {
export const useExtensionSmsDetailMutation = (options?: UseMutationOptions<ExtensionSmsDetailResponse, CBDCAxiosError, ExtensionSmsDetailParams>) => {
const mutation = useMutation<ExtensionSmsDetailResponse, CBDCAxiosError, ExtensionSmsDetailParams>({
...options,
mutationFn: (params: ExtensionSmsDetailParams) => extensionSmsDetail(params),

View File

@@ -1,29 +0,0 @@
import axios from 'axios';
import { API_URL_ADDITIONAL_SERVICE } from '@/shared/api/api-url-additional-service';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsListParams,
ExtensionSmsListResponse
} from '../../model/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const extensionSmsList = (params: ExtensionSmsListParams) => {
return resultify(
axios.post<ExtensionSmsListResponse>(API_URL_ADDITIONAL_SERVICE.extensionSmsList(), params),
);
};
export const useExtensionSmsListMutation = (options?: UseMutationOptions<ExtensionSmsListResponse, CBDCAxiosError, ExtensionSmsListParams>) => {
const mutation = useMutation<ExtensionSmsListResponse, CBDCAxiosError, ExtensionSmsListParams>({
...options,
mutationFn: (params: ExtensionSmsListParams) => extensionSmsList(params),
});
return {
...mutation,
};
};

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsResendParams,
ExtensionSmsResendResponse
} from '../../model/types';
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions

View File

@@ -0,0 +1,29 @@
import axios from 'axios';
import { API_URL_ADDITIONAL_SERVICE } from '@/shared/api/api-url-additional-service';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDetailParams,
ExtensionSmsDetailResponse
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const extensionSmsDetail = (params: ExtensionSmsDetailParams) => {
return resultify(
axios.post<ExtensionSmsDetailResponse>(API_URL_ADDITIONAL_SERVICE.extensionSmsDetail(), params),
);
};
export const useExtensionSmsDetailMutation = (options?: UseMutationOptions<ExtensionSmsDetailResponse, CBDCAxiosError, ExtensionSmsDetailParams>) => {
const mutation = useMutation<ExtensionSmsDetailResponse, CBDCAxiosError, ExtensionSmsDetailParams>({
...options,
mutationFn: (params: ExtensionSmsDetailParams) => extensionSmsDetail(params),
});
return {
...mutation,
};
};

View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDownloadExcelParams,
ExtensionSmsDownloadExcelResponse
} from '../../model/types';
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions

View File

@@ -0,0 +1,29 @@
import axios from 'axios';
import { API_URL_ADDITIONAL_SERVICE } from '@/shared/api/api-url-additional-service';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsPaymentListParams,
ExtensionSmsPaymentListResponse
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const extensionSmsList = (params: ExtensionSmsPaymentListParams) => {
return resultify(
axios.post<ExtensionSmsPaymentListResponse>(API_URL_ADDITIONAL_SERVICE.extensionSmsList(), params),
);
};
export const useExtensionSmsListMutation = (options?: UseMutationOptions<ExtensionSmsPaymentListResponse, CBDCAxiosError, ExtensionSmsPaymentListParams>) => {
const mutation = useMutation<ExtensionSmsPaymentListResponse, CBDCAxiosError, ExtensionSmsPaymentListParams>({
...options,
mutationFn: (params: ExtensionSmsPaymentListParams) => extensionSmsList(params),
});
return {
...mutation,
};
};

View File

@@ -0,0 +1,29 @@
import axios from 'axios';
import { API_URL_ADDITIONAL_SERVICE } from '@/shared/api/api-url-additional-service';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsResendParams,
ExtensionSmsResendResponse
} from '../../model/sms-payment/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const extensionSmsResend = (params: ExtensionSmsResendParams) => {
return resultify(
axios.post<ExtensionSmsResendResponse>(API_URL_ADDITIONAL_SERVICE.extensionSmsResend(), params),
);
};
export const useExtensionSmsResendMutation = (options?: UseMutationOptions<ExtensionSmsResendResponse, CBDCAxiosError, ExtensionSmsResendParams>) => {
const mutation = useMutation<ExtensionSmsResendResponse, CBDCAxiosError, ExtensionSmsResendParams>({
...options,
mutationFn: (params: ExtensionSmsResendParams) => extensionSmsResend(params),
});
return {
...mutation,
};
};

View File

@@ -0,0 +1,93 @@
import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/common/model/types';
import { ExtensionRequestParams, FilterProps, ListItemProps } from '../types';
export enum SmsType {
ALL = "ALL",
VACCOUNT_REQ = "VACCOUNT_REQ",
VACCOUNT_REQ_DEPOSIT = "VACCOUNT_REQ_DEPOSIT"
}
export enum SmsPaymentSearchType {
BUYER_NAME = "BUYER_NAME",
RECEIVE_PHONE_NUMBER = "RECEIVE_PHONE_NUMBER"
}
export interface SmsPaymentListItem {
mid?: string;
tid?: string;
paymentDate?: string;
paymentStatus?: string;
smsCl?: string;
}
export interface SmsPaymentListProps {
listItems: Record<string, Array<ListItemProps>>;
mid: string;
onResendClick?: (mid: string, tid: string) => void;
}
export interface SmsPaymentFilterProps extends FilterProps {
mid: string;
searchCl: SmsPaymentSearchType;
searchValue: string;
fromDate: string;
toDate: string;
smsCl: SmsType;
setMid: (mid: string) => void;
setSearchCl: (searchCl: SmsPaymentSearchType) => void;
setSearchValue: (searchValue: string) => void;
setFromDate: (fromDate: string) => void;
setToDate: (toDate: string) => void;
setSmsCl: (smsCl: SmsType) => void;
}
export interface ExtensionSmsPaymentListParams extends ExtensionRequestParams {
searchCl: SmsPaymentSearchType;
searchValue: string;
fromDate: string;
toDate: string;
smsCl: string;
page?: DefaultRequestPagination;
}
export interface ExtensionSmsPaymentListResponse extends DefaulResponsePagination {
content: Array<ListItemProps>
}
export interface ExtensionSmsDownloadExcelParams extends ExtensionRequestParams {
searchCl?: SmsPaymentSearchType;
searchValue: string;
fromDate: string;
toDate: string;
smsCl?: string;
}
export interface ExtensionSmsDownloadExcelResponse {
status: boolean;
}
export interface ExtensionSmsDetailParams extends ExtensionRequestParams {
tid: string;
}
export interface ExtensionSmsDetailResponse {
senderNumber: string;
senderName: string;
receiverNumber: string;
receiverName: string;
sendMessage: string;
}
export interface ExtensionSmsResendParams extends ExtensionRequestParams {
tid: string;
}
export interface ExtensionSmsResendResponse {
status: boolean;
}
export interface SmsPaymentDetailResendProps {
bottomSmsPaymentDetailResendOn: boolean;
setBottomSmsPaymentDetailResendOn: (bottomSmsPaymentDetailResendOn: boolean) => void;
smsDetailData: ExtensionSmsDetailResponse | null;
}

View File

@@ -3,6 +3,8 @@ import { PayoutContent } from './payout/types';
import { FundAccountTransferContentItem, FundAccountResultContentItem } from './fund-account/types';
import { ArsListContent } from './ars/types';
import { AlimtalkListContent } from './alimtalk/types';
import { SmsPaymentListItem } from './sms-payment/types';
import type { ExtensionSmsDetailResponse } from './sms-payment/types';
// ========================================
// 공통 Enums 및 타입들
@@ -391,12 +393,13 @@ export interface SettlementAgencyBottomAgreeProps {
export interface ListItemProps extends
KeyInPaymentListItem, AccountHolderSearchListItem,
AccountHolderAuthListItem, LinkPaymentHistoryListItem,
LinkPaymentWaitListItem,
LinkPaymentWaitListItem, SmsPaymentListItem,
PayoutContent, FundAccountTransferContentItem,
FundAccountResultContentItem,
ArsListContent, AlimtalkListContent {
additionalServiceCategory?: AdditionalServiceCategory;
mid?: string
mid?: string;
onResendClick?: (mid: string, tid: string) => void;
}
export interface ListDateGroupProps {
@@ -404,6 +407,7 @@ export interface ListDateGroupProps {
date?: string;
items?: Array<ListItemProps>;
mid?: string;
onResendClick?: (mid: string, tid: string) => void;
}
export interface AdditionalServiceListProps {
@@ -770,13 +774,6 @@ export interface ExtensionSmsDetailParams extends ExtensionRequestParams {
tid: string;
}
export interface ExtensionSmsDetailResponse {
senderNumber: string;
senderName: string;
receiverNumber: string;
receiverName: string;
sendMessage: string;
}
// ========================================
@@ -823,7 +820,3 @@ export interface ArsCardPaymentFinishProps {
setRequestSuccess: (requestSuccess: boolean) => void;
}
export interface SmsPaymentDetailResendProps {
bottomSmsPaymentDetailResendOn: boolean;
setBottomSmsPaymentDetailResendOn: (bottomSmsPaymentDetailResendOn: boolean) => void;
}

View File

@@ -1,4 +1,3 @@
import { PATHS } from '@/shared/constants/paths';
import { ListDateGroup } from '../list-date-group';
import { AccountHolderAuthListProps, AdditionalServiceCategory } from '../../model/types';

View File

@@ -39,10 +39,6 @@ export const AccountHolderSearchFilter = ({
const [filterEndDate, setFilterEndDate] = useState<string>(moment(endDate).format('YYYY.MM.DD'));
const [filterBank, setFilterBank] = useState<string>(bank)
const [filterProcessResult, setFilterProcessResult] = useState<ProcessResult>(processResult);
const [dateReadOnly, setDateReadyOnly] = useState<boolean>(true);
const [filterDateOptionsBtn, setFilterDateOptionsBtn] = useState<FilterDateOptions>(FilterDateOptions.Input);
const [calendarOpen, setCalendarOpen] = useState<boolean>(false);
const variants = {
hidden: { x: '100%' },

View File

@@ -105,7 +105,7 @@ export const KeyInPaymentFilter = ({
<FilterSelect
title='가맹점'
selectValue={filterMid}
selectSetter={setFilterMid}
selectSetter={setMid}
selectOptions={MidOptions}
></FilterSelect>
<FilterCalendar

View File

@@ -7,7 +7,8 @@ export const ListDateGroup = ({
additionalServiceCategory,
date,
items,
mid
mid,
onResendClick
}: ListDateGroupProps) => {
moment.locale('ko');
const getStateDate = () => {
@@ -63,6 +64,9 @@ export const ListDateGroup = ({
sendCl={ items[i]?.sendCl }
paymentMethod={ items[i]?.paymentMethod }
receiverName={ items[i]?.receiverName }
smsCl= { items[i]?.smsCl }
onResendClick={ onResendClick }
></ListItem>
)
}

View File

@@ -13,19 +13,22 @@ export const ListItem = ({
amount, sendDate, sendStatus, sendMethod,
scheduledSendDate, processStatus,
accountName,transferStatus,
accountName, transferStatus,
submallId, settlementDate, companyName,
disbursementStatus, disbursementAmount,
transferAmount, receiveBankName,
transferAmount, receiveBankName,
receiveAccountNo, receiveAccountName,
status, processDate,
orderStatus, arsPaymentMethod,
alimCl, sendType, sendCl,
paymentMethod, receiverName
paymentMethod, receiverName,
smsCl,
onResendClick
}: ListItemProps) => {
const { navigate } = useNavigate();
const getItemClass = () => {
@@ -100,13 +103,21 @@ export const ListItem = ({
} else {
rs = 'gray'
}
} else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment) {
if (smsCl === "VACCOUNT_REQ_DEPOSIT") {
rs = 'blue'
} else {
rs = 'gray'
}
}
return rs;
};
const onClickToNavigate = () => {
if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment ||
additionalServiceCategory === AdditionalServiceCategory.SMSPayment
) {
return;
}
@@ -176,7 +187,7 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
navigate(PATHS.additionalService.ars.detail, {
state: {
additionalServiceCategory: additionalServiceCategory,
@@ -186,7 +197,7 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk){
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
navigate(PATHS.additionalService.alimtalk.detail, {
state: {
additionalServiceCategory: additionalServiceCategory,
@@ -220,11 +231,11 @@ export const ListItem = ({
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
timeStr = moment(requestDate).format('mm:ss');
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
let time = paymentDate?.substring(8, 12);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
}
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk){
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
let time = paymentDate?.substring(8, 12);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
}
@@ -257,16 +268,19 @@ export const ListItem = ({
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
str = companyName;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment) {
str = `${paymentDate}(${paymentStatus})[추후 수정 필요]`
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
str = '이름(' + tid + ')';
}
else if(additionalServiceCategory === AdditionalServiceCategory.Alimtalk){
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
str = `${receiverName}(${tid})`;
}
@@ -277,7 +291,7 @@ export const ListItem = ({
let rs = [];
if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
rs.push(
<div className="transaction-details">
<div key='key-in-list' className="transaction-details">
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{paymentStatus}</span>
@@ -295,7 +309,7 @@ export const ListItem = ({
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
rs.push(
<div className="transaction-details">
<div key="account-search" className="transaction-details">
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{bankName}</span>
@@ -305,7 +319,7 @@ export const ListItem = ({
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory) {
if (paymentStatus === "PAYMENT_FAIL" || paymentStatus === "INACTIVE") {
rs.push(
<div className="transaction-details">
<div key="link-payment-history" className="transaction-details">
<span>{getPaymentStatusText(paymentStatus)}</span>
<span className="separator">|</span>
<span>{getSendMethodText(sendMethod)}</span>
@@ -313,7 +327,7 @@ export const ListItem = ({
)
} else {
rs.push(
<div className="transaction-details">
<div key="link-payment-history" className="transaction-details">
<span>{getPaymentStatusText(paymentStatus)}</span>
<span className="separator">|</span>
<span>{getSendMethodText(sendMethod)}</span>
@@ -325,7 +339,7 @@ export const ListItem = ({
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
rs.push(
<div className="transaction-details">
<div key="link-payment-wait" className="transaction-details">
<span>{getProcessStatusText(processStatus)}</span>
<span className="separator">|</span>
<span>{getSendMethodText(sendMethod)}</span>
@@ -341,48 +355,57 @@ export const ListItem = ({
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{ status }</span>
<span>{status}</span>
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{ status }</span>
<span>{status}</span>
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{ paymentStatus }</span>
<span>{paymentStatus}</span>
<span className="separator">|</span>
<span>{ orderStatus }</span>
<span>{orderStatus}</span>
<span className="separator">|</span>
<span>{ arsPaymentMethod }</span>
<span>{arsPaymentMethod}</span>
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.Alimtalk){
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span>{getTime()}</span>
<span className="separator">|</span>
<span>{ paymentMethod }</span>
<span>{paymentMethod}</span>
<span className="separator">|</span>
<span>{ alimCl }</span>
<span>{alimCl}</span>
</div>
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment) {
rs.push(
<div key="sms-payment" className="transaction-details">
<span>{mid}</span>
<span className="separator">|</span>
<span>{smsCl}</span>
</div>
)
}
return rs;
};
@@ -394,7 +417,7 @@ export const ListItem = ({
{resultStatus === 'SUCCESS' ? '성공' : '실패'}
</div>
);
}
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
rs.push(
<div className={`status-label ${(transferStatus === 'REQUEST' || transferStatus === 'SUCCESS') ? 'success' : 'fail'}`}>
@@ -493,9 +516,18 @@ export const ListItem = ({
<div
key="payout-item-amount"
className="transaction-amount"
>{ sendCl }</div>
>{sendCl}</div>
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick && tid) {
rs.push(
<div
key="sms-payment-amount"
className={`status-label success`}
onClick={() => mid && tid && onResendClick(mid, tid)}
>{'재발송'}</div>
)
}
return rs;
}
@@ -509,10 +541,10 @@ export const ListItem = ({
<div className={`status-dot ${getDotClass()}`}></div>
</div>
<div className="transaction-content">
<div className="transaction-title">{ getTitle() }</div>
{ getDetail() }
<div className="transaction-title">{getTitle()}</div>
{getDetail()}
</div>
{ getAmount() }
{getAmount()}
</div>
</>
);

View File

@@ -1,8 +0,0 @@
export const SmsPaymentFilter = () => {
return (
<>
</>
);
};

View File

@@ -1,10 +1,11 @@
import { motion } from 'framer-motion';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { SmsPaymentDetailResendProps } from '../model/types';
import { SmsPaymentDetailResendProps } from '../../../additional-service/model/sms-payment/types';
export const SmsPaymentDetailResend = ({
bottomSmsPaymentDetailResendOn,
setBottomSmsPaymentDetailResendOn
setBottomSmsPaymentDetailResendOn,
smsDetailData
}: SmsPaymentDetailResendProps) => {
const variants = {
@@ -44,11 +45,11 @@ export const SmsPaymentDetailResend = ({
</div>
</div>
<div className="resend-info">
<div className="resend-row">() : (16610808)</div>
<div className="resend-row">() : *(010****7000)</div>
<div className="resend-row">() : {smsDetailData?.senderName || '-'}({smsDetailData?.senderNumber || '-'})</div>
<div className="resend-row">() : {smsDetailData?.receiverName || '-'}({smsDetailData?.receiverNumber || '-'})</div>
</div>
<div className="resend-box">
<p className="resend-text">[]*, 110322141414 (300 06/08 )</p>
<p className="resend-text">{smsDetailData?.sendMessage || '-'}</p>
</div>
<div className="bottomsheet-footer">
<button className="btn-50 btn-blue flex-1" type="button"></button>

View File

@@ -0,0 +1,140 @@
import moment from 'moment';
import { IMAGE_ROOT } from '@/shared/constants/common';
import { motion } from 'framer-motion';
import { useState } from 'react';
import { FilterSelect } from '@/shared/ui/filter/select';
import { FilterSelectInput } from '@/shared/ui/filter/select-input';
import { FilterDateOptions } from '@/entities/common/model/types';
import { FilterCalendar } from '@/shared/ui/filter/calendar';
import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
import { SmsPaymentFilterProps, SmsPaymentSearchType, SmsType } from '../../model/sms-payment/types';
export const SmsPaymentFilter = ({
filterOn,
setFilterOn,
mid,
searchCl,
searchValue,
fromDate,
toDate,
smsCl,
setMid,
setSearchCl,
setSearchValue,
setFromDate,
setToDate,
setSmsCl
}: SmsPaymentFilterProps) => {
const [filterMid, setFilterMid] = useState<string>(mid);
const [filterSearchCl, setFilterSearchCl] = useState<SmsPaymentSearchType>(searchCl);
const [filterSearchValue, setFilterSearchValue] = useState<string>(searchValue);
const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
const [filterSmsCl, setFilterSmsCl] = useState<SmsType>(smsCl);
const variants = {
hidden: { x: '100%' },
visible: { x: '0%' },
};
const onClickToSetFilter = () => {
setMid(filterMid);
setSearchCl(filterSearchCl);
setSearchValue(filterSearchValue);
setFromDate(filterFromDate);
setToDate(filterToDate);
setSmsCl(filterSmsCl);
onClickToClose();
};
let MidOptions = [
{ name: 'nictest001m', value: 'nictest001m' },
{ name: 'nictest002m', value: 'nictest002m' }
];
let searchTypeOption = [
{ name: '주문자', value: SmsPaymentSearchType.BUYER_NAME },
{ name: '수신번호', value: SmsPaymentSearchType.RECEIVE_PHONE_NUMBER },
]
let smsTypeOption = [
{ name: '전체', value: SmsType.ALL },
{ name: '가상계좌요청', value: SmsType.VACCOUNT_REQ },
{ name: '가상계좌 요청+입금', value: SmsType.VACCOUNT_REQ_DEPOSIT },
]
const onClickToClose = () => {
setFilterOn(false);
};
return (
<>
<motion.div
id="fullMenuModal"
className="full-menu-modal"
initial="hidden"
animate={(filterOn) ? 'visible' : 'hidden'}
variants={variants}
transition={{ duration: 0.3 }}
style={{
width: '100%',
height: '100%',
}}
>
<div className="full-menu-container">
<div className="full-menu-header">
<div className="full-menu-title center"></div>
<div className="full-menu-actions">
<button
id="closeFullMenu"
className="full-menu-close"
>
<img
src={IMAGE_ROOT + '/ico_close.svg'}
alt="닫기"
onClick={() => onClickToClose()}
/>
</button>
</div>
</div>
<div className="option-list pt-16">
<FilterSelect
title='가맹점'
selectValue={mid}
selectSetter={setMid}
selectOptions={MidOptions}
></FilterSelect>
<FilterSelectInput
title='주문자,수신번호'
selectValue={searchCl}
selectSetter={setSearchCl}
selectOptions={searchTypeOption}
inputValue={searchValue}
inputSetter={setSearchValue}
></FilterSelectInput>
<FilterCalendar
startDate={filterFromDate}
endDate={filterToDate}
setStartDate={setFilterFromDate}
setEndDate={setFilterToDate}
></FilterCalendar>
<FilterButtonGroups
title='조회결과'
activeValue={filterSmsCl}
btnGroups={smsTypeOption}
setter={setFilterSmsCl}
></FilterButtonGroups>
</div>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToSetFilter()}
></button>
</div>
</div>
</motion.div>
</>
);
};

View File

@@ -0,0 +1,35 @@
import { SmsPaymentListProps } from '../../model/sms-payment/types';
import { AdditionalServiceCategory } from '../../model/types';
import { ListDateGroup } from '../list-date-group';
export const SmsPaymentList = ({
listItems,
mid,
onResendClick
}: SmsPaymentListProps) => {
const getListDateGroup = () => {
let rs = [];
for (const [key, value] of Object.entries(listItems)) {
rs.push(
<ListDateGroup
additionalServiceCategory={AdditionalServiceCategory.SMSPayment}
key={key}
date={key}
items={value}
mid={mid}
onResendClick={onResendClick}
></ListDateGroup>
)
}
return rs;
};
return (
<>
<div className="transaction-list">
{getListDateGroup()}
</div>
</>
)
}

View File

@@ -1,24 +1,50 @@
import axios from 'axios';
import { API_URL } from '@/shared/api/urls';
import { resultify } from '@/shared/lib/resultify';
import { API_URL_USER } from '@/shared/api/api-url-user';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
import {
UserCreateParams,
UserCreateResponse
} from '../model/types';
import {
interface UserCreateMutationResponse {
status: boolean;
data?: UserCreateResponse;
error?: {
root: string;
errKey: string;
code: string;
message: string;
timestamp: string;
details: Record<string, string>;
};
}
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const userCreate = (params: UserCreateParams) => {
return resultify(
axios.post<UserCreateResponse>(API_URL.userCreate(), params),
);
export const userCreate = async (params: UserCreateParams): Promise<UserCreateMutationResponse> => {
try {
const response = await axios.post<UserCreateResponse>(API_URL_USER.userCreate(), params);
return { status: true, data: response.data };
} catch (error: any) {
return {
status: false,
error: {
root: 'USER_CREATE',
errKey: error.response?.data?.errKey || 'UNKNOWN_ERROR',
code: error.response?.status?.toString() || '500',
message: error.response?.data?.message || error.message || 'Unknown error',
timestamp: new Date().toISOString(),
details: error.response?.data?.details || {}
}
};
}
};
export const useUserCreateMutation = (options?: UseMutationOptions<UserCreateResponse, CBDCAxiosError, UserCreateParams>) => {
const mutation = useMutation<UserCreateResponse, CBDCAxiosError, UserCreateParams>({
export const useUserCreateMutation = (options?: UseMutationOptions<UserCreateMutationResponse, CBDCAxiosError, UserCreateParams>) => {
const mutation = useMutation<UserCreateMutationResponse, CBDCAxiosError, UserCreateParams>({
...options,
mutationFn: (params: UserCreateParams) => userCreate(params),
});

View File

@@ -1,9 +1,8 @@
import axios from 'axios';
import { API_URL } from '@/shared/api/urls';
import { API_URL_USER } from '@/shared/api/api-url-user';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
UserExistsUseridParams,
UserExistsUseridResponse
} from '../model/types';
import {
@@ -11,16 +10,16 @@ import {
UseMutationOptions
} from '@tanstack/react-query';
export const userExistsUserid = (params: UserExistsUseridParams) => {
export const userExistsUserid = (usrId: string) => {
return resultify(
axios.post<UserExistsUseridResponse>(API_URL.userExistsUserid(), params),
axios.post<UserExistsUseridResponse>(API_URL_USER.userExistsUserid(usrId)),
);
};
export const useUserExistsUseridMutation = (options?: UseMutationOptions<UserExistsUseridResponse, CBDCAxiosError, UserExistsUseridParams>) => {
const mutation = useMutation<UserExistsUseridResponse, CBDCAxiosError, UserExistsUseridParams>({
export const useUserExistsUseridMutation = (options?: UseMutationOptions<UserExistsUseridResponse, CBDCAxiosError, string>) => {
const mutation = useMutation<UserExistsUseridResponse, CBDCAxiosError, string>({
...options,
mutationFn: (params: UserExistsUseridParams) => userExistsUserid(params),
mutationFn: (usrId: string) => userExistsUserid(usrId),
});
return {

View File

@@ -0,0 +1,31 @@
import axios from 'axios';
import { API_URL_USER } from '@/shared/api/api-url-user';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
UserExistsUseridResponse
} from '../model/types';
import {
useQuery,
UseQueryOptions
} from '@tanstack/react-query';
export const userExistsUserid = async (usrid: string) => {
const response = await axios.post<UserExistsUseridResponse>(API_URL_USER.userExistsUserid(usrid));
return response.data;
};
export const useUserExistsUseridQuery = (
usrid: string,
options?: Omit<UseQueryOptions<UserExistsUseridResponse, CBDCAxiosError>, 'queryKey' | 'queryFn'>
) => {
const query = useQuery<UserExistsUseridResponse, CBDCAxiosError>({
queryKey: ['userExistsUserid', usrid],
queryFn: async () => await userExistsUserid(usrid),
enabled: !!usrid && usrid.trim().length > 0, // usrid가 있을 때만 실행
...options,
});
return {
...query,
};
};

View File

@@ -0,0 +1,29 @@
import axios from 'axios';
import { API_URL_USER } from '@/shared/api/api-url-user';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
UserFindAuthMethodParams,
UserFindAuthMethodResponse
} from '../model/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const userFindAuthMethod = (params: UserFindAuthMethodParams) => {
return resultify(
axios.post<UserFindAuthMethodResponse>(API_URL_USER.findAuthMethod(), params),
);
};
export const useUserFindAuthMethodMutation = (options?: UseMutationOptions<UserFindAuthMethodResponse, CBDCAxiosError, UserFindAuthMethodParams>) => {
const mutation = useMutation<UserFindAuthMethodResponse, CBDCAxiosError, UserFindAuthMethodParams>({
...options,
mutationFn: (params: UserFindAuthMethodParams) => userFindAuthMethod(params),
});
return {
...mutation,
};
};

View File

@@ -0,0 +1,29 @@
import axios from 'axios';
import { API_URL_USER } from '@/shared/api/api-url-user';
import { resultify } from '@/shared/lib/resultify';
import { CBDCAxiosError } from '@/shared/@types/error';
import {
UserFindParams,
UserFindResponse
} from '../model/types';
import {
useMutation,
UseMutationOptions
} from '@tanstack/react-query';
export const userFind = (params: UserFindParams) => {
return resultify(
axios.post<UserFindResponse>(API_URL_USER.findUser(), params),
);
};
export const useUserFindMutation = (options?: UseMutationOptions<UserFindResponse, CBDCAxiosError, UserFindParams>) => {
const mutation = useMutation<UserFindResponse, CBDCAxiosError, UserFindParams>({
...options,
mutationFn: (params: UserFindParams) => userFind(params),
});
return {
...mutation,
};
};

View File

@@ -1,3 +1,8 @@
import {
DefaulResponsePagination,
DefaultRequestPagination
} from '@/entities/common/model/types';
export interface LoginParams {
id: string;
password: string;
@@ -21,28 +26,60 @@ export interface LoginResponse {
available2FAMethod?: Array<string>;
requires2FA?: boolean;
};
export interface UserInfo extends LoginResponse {
}
export interface UserParams {
};
export interface UserListItem {
usrid: string;
idCl: string;
status: string;
}
export interface UserFindResponse extends DefaulResponsePagination {
content: Array<UserListItem>;
};
export interface UserFindParams {
mid: string;
page: DefaultRequestPagination;
};
export interface UserExistsUseridParams {
usrId: string;
};
export interface UserFindAuthMethodParams {
mid: string;
usrid: string;
page?: DefaultRequestPagination;
};
export interface UserFindAuthMethodResponse {
status: boolean;
data: UserAuthMethodData;
};
export interface UserExistsUseridResponse {
exists: boolean;
};
export interface VerificationsItem {
type: string;
contact: string;
};
export interface UserCreateParams {
userId: string;
password: string;
loginRange: string;
verification: Array<VerificationsItem>
};
export interface UserData {
usrid: string;
mid: string;
@@ -85,5 +122,17 @@ export interface UserData {
};
export interface UserCreateResponse {
user: UserData;
};
};
export interface AuthMethodItem {
usrid: string;
systemAdminClassId: string;
authMethodType: string;
sequence: number;
content: string;
}
export interface UserAuthMethodData {
emails: Array<AuthMethodItem>;
phones: Array<AuthMethodItem>;
}