주식 매매 api 및 화면 오류 수정
This commit is contained in:
@@ -26,18 +26,46 @@ const getLatestBy = (items, key) => {
|
||||
};
|
||||
|
||||
const normalizeIndices = (data) => {
|
||||
if (!data || typeof data !== 'object' || Array.isArray(data)) return [];
|
||||
return Object.entries(data)
|
||||
.filter(([, value]) => value && typeof value === 'object')
|
||||
.map(([name, value]) => ({
|
||||
name,
|
||||
value: value?.value ?? '-',
|
||||
change: value?.change ?? '',
|
||||
percent: value?.percent ?? '',
|
||||
if (!data) return [];
|
||||
|
||||
if (Array.isArray(data)) {
|
||||
return data.map((item) => ({
|
||||
name: item?.name ?? '-',
|
||||
value: item?.value ?? '-',
|
||||
change: item?.change_value ?? item?.change ?? '',
|
||||
percent: item?.change_percent ?? item?.percent ?? '',
|
||||
direction: item?.direction ?? '',
|
||||
}));
|
||||
}
|
||||
|
||||
if (Array.isArray(data?.indices)) {
|
||||
return data.indices.map((item) => ({
|
||||
name: item?.name ?? '-',
|
||||
value: item?.value ?? '-',
|
||||
change: item?.change_value ?? item?.change ?? '',
|
||||
percent: item?.change_percent ?? item?.percent ?? '',
|
||||
direction: item?.direction ?? '',
|
||||
}));
|
||||
}
|
||||
|
||||
if (typeof data === 'object') {
|
||||
return Object.entries(data)
|
||||
.filter(([, value]) => value && typeof value === 'object')
|
||||
.map(([name, value]) => ({
|
||||
name,
|
||||
value: value?.value ?? '-',
|
||||
change: value?.change ?? '',
|
||||
percent: value?.percent ?? '',
|
||||
direction: value?.direction ?? '',
|
||||
}));
|
||||
}
|
||||
|
||||
return [];
|
||||
};
|
||||
|
||||
const getDirection = (change, percent) => {
|
||||
const getDirection = (change, percent, direction) => {
|
||||
if (direction === 'red') return 'up';
|
||||
if (direction === 'blue') return 'down';
|
||||
const pick = (value) =>
|
||||
value === undefined || value === null || value === '' ? null : value;
|
||||
const raw = pick(change) ?? pick(percent);
|
||||
@@ -209,7 +237,8 @@ const Stock = () => {
|
||||
sortedIndices.map((item) => {
|
||||
const direction = getDirection(
|
||||
item.change,
|
||||
item.percent
|
||||
item.percent,
|
||||
item.direction
|
||||
);
|
||||
const changeText = [
|
||||
item.change,
|
||||
|
||||
@@ -18,6 +18,40 @@ const formatPercent = (value) => {
|
||||
return `${numeric.toFixed(2)}%`;
|
||||
};
|
||||
|
||||
const pickFirst = (...values) =>
|
||||
values.find((value) => value !== undefined && value !== null && value !== '');
|
||||
|
||||
const getQty = (item) =>
|
||||
pickFirst(item?.qty, item?.quantity, item?.holding, item?.hold_qty);
|
||||
|
||||
const getBuyPrice = (item) =>
|
||||
pickFirst(
|
||||
item?.buy_price,
|
||||
item?.avg_price,
|
||||
item?.avg,
|
||||
item?.buyPrice,
|
||||
item?.price
|
||||
);
|
||||
|
||||
const getCurrentPrice = (item) =>
|
||||
pickFirst(
|
||||
item?.current_price,
|
||||
item?.current,
|
||||
item?.cur_price,
|
||||
item?.now_price,
|
||||
item?.market_price
|
||||
);
|
||||
|
||||
const getProfitRate = (item) =>
|
||||
pickFirst(
|
||||
item?.profit_rate,
|
||||
item?.profitRate,
|
||||
item?.profit_pct,
|
||||
item?.profitPercent,
|
||||
item?.pnl_rate,
|
||||
item?.return_rate
|
||||
);
|
||||
|
||||
const StockTrade = () => {
|
||||
const [balance, setBalance] = useState(null);
|
||||
const [balanceLoading, setBalanceLoading] = useState(false);
|
||||
@@ -46,7 +80,7 @@ const StockTrade = () => {
|
||||
try {
|
||||
const result = await requestAutoTrade();
|
||||
setAutoResult(result);
|
||||
if (result?.status === 'success') {
|
||||
if (result?.status === 'success' || result?.status === 'completed') {
|
||||
await loadBalance();
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -60,14 +94,33 @@ const StockTrade = () => {
|
||||
loadBalance();
|
||||
}, []);
|
||||
|
||||
const holdings = useMemo(
|
||||
() => (Array.isArray(balance?.holdings) ? balance.holdings : []),
|
||||
[balance]
|
||||
);
|
||||
const holdings = useMemo(() => {
|
||||
if (!balance) return [];
|
||||
if (Array.isArray(balance.holdings)) return balance.holdings;
|
||||
if (Array.isArray(balance.positions)) return balance.positions;
|
||||
if (Array.isArray(balance.items)) return balance.items;
|
||||
return [];
|
||||
}, [balance]);
|
||||
const summary = balance?.summary ?? {};
|
||||
const totalEval =
|
||||
summary.total_eval ?? balance?.total_eval ?? balance?.total_value;
|
||||
const deposit = summary.deposit ?? balance?.deposit ?? balance?.available_cash;
|
||||
const autoStatus = autoResult?.status ?? '';
|
||||
const decision = autoResult?.decision ?? null;
|
||||
const decision = autoResult?.decision ?? autoResult?.ai_response ?? null;
|
||||
const tradeResult = autoResult?.trade_result ?? null;
|
||||
const execution = autoResult?.execution ?? tradeResult?.execution ?? '';
|
||||
const statusLabel =
|
||||
tradeResult?.success === true
|
||||
? '성공'
|
||||
: tradeResult?.success === false
|
||||
? '실패'
|
||||
: autoStatus === 'completed'
|
||||
? '완료'
|
||||
: autoStatus === 'success'
|
||||
? '성공'
|
||||
: autoStatus
|
||||
? autoStatus
|
||||
: '대기';
|
||||
|
||||
return (
|
||||
<div className="stock">
|
||||
@@ -90,11 +143,11 @@ const StockTrade = () => {
|
||||
<div className="stock-status">
|
||||
<div>
|
||||
<span>총 평가금액</span>
|
||||
<strong>{formatNumber(summary.total_eval)}</strong>
|
||||
<strong>{formatNumber(totalEval)}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>예수금</span>
|
||||
<strong>{formatNumber(summary.deposit)}</strong>
|
||||
<strong>{formatNumber(deposit)}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>보유 종목</span>
|
||||
@@ -137,11 +190,11 @@ const StockTrade = () => {
|
||||
{[
|
||||
{
|
||||
label: '총 평가',
|
||||
value: summary.total_eval,
|
||||
value: totalEval,
|
||||
},
|
||||
{
|
||||
label: '예수금',
|
||||
value: summary.deposit,
|
||||
value: deposit,
|
||||
},
|
||||
].map((item) => (
|
||||
<div
|
||||
@@ -171,25 +224,25 @@ const StockTrade = () => {
|
||||
<div>
|
||||
<span>수량</span>
|
||||
<strong>
|
||||
{formatNumber(item.qty)}
|
||||
{formatNumber(getQty(item))}
|
||||
</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>매입가</span>
|
||||
<strong>
|
||||
{formatNumber(item.buy_price)}
|
||||
{formatNumber(getBuyPrice(item))}
|
||||
</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>현재가</span>
|
||||
<strong>
|
||||
{formatNumber(item.current_price)}
|
||||
{formatNumber(getCurrentPrice(item))}
|
||||
</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>수익률</span>
|
||||
<strong>
|
||||
{formatPercent(item.profit_rate)}
|
||||
{formatPercent(getProfitRate(item))}
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
@@ -244,7 +297,11 @@ const StockTrade = () => {
|
||||
<div className="stock-status">
|
||||
<div>
|
||||
<span>액션</span>
|
||||
<strong>{decision?.action ?? '-'}</strong>
|
||||
<strong>
|
||||
{decision?.action ??
|
||||
decision?.decision ??
|
||||
'-'}
|
||||
</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>종목코드</span>
|
||||
@@ -268,14 +325,14 @@ const StockTrade = () => {
|
||||
<div className="stock-status">
|
||||
<div>
|
||||
<span>상태</span>
|
||||
<strong>
|
||||
{tradeResult?.success === true
|
||||
? '성공'
|
||||
: tradeResult?.success === false
|
||||
? '실패'
|
||||
: '대기'}
|
||||
</strong>
|
||||
<strong>{statusLabel}</strong>
|
||||
</div>
|
||||
{execution ? (
|
||||
<div>
|
||||
<span>실행</span>
|
||||
<strong>{execution}</strong>
|
||||
</div>
|
||||
) : null}
|
||||
<div>
|
||||
<span>주문번호</span>
|
||||
<strong>
|
||||
|
||||
Reference in New Issue
Block a user