From 5ed2431acc0de55eb0d0a88d6b20de092f0ce6ae Mon Sep 17 00:00:00 2001 From: seongyun4359 <1112csy@naver.com> Date: Fri, 10 Jan 2025 20:42:36 +0900 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F:=20null=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(main)/page.tsx | 2 +- .../index.tsx | 2 +- .../summary-data/utils/mainMiniCardUtils.ts | 49 +++++-------------- 3 files changed, 15 insertions(+), 38 deletions(-) rename src/features/summary-data/components/{main-page => main-page-mini-card}/index.tsx (100%) diff --git a/src/app/(main)/page.tsx b/src/app/(main)/page.tsx index 546c31f..73760c5 100644 --- a/src/app/(main)/page.tsx +++ b/src/app/(main)/page.tsx @@ -3,7 +3,7 @@ import { BidPieChart } from "@/features/realtime/components/chart/bid-pie-chart" import WeeklyPowerChart from "@/features/realtime/components/chart/weekly-power-chart" import { RegionalEnergyChart } from "@/features/region/components/RegionalEnergyChart" -import { MainPageSummaryCard } from "@/features/summary-data/components/main-page" +import { MainPageSummaryCard } from "@/features/summary-data/components/main-page-mini-card" import { Card, CardHeader, diff --git a/src/features/summary-data/components/main-page/index.tsx b/src/features/summary-data/components/main-page-mini-card/index.tsx similarity index 100% rename from src/features/summary-data/components/main-page/index.tsx rename to src/features/summary-data/components/main-page-mini-card/index.tsx index 96b717e..8d6e27e 100644 --- a/src/features/summary-data/components/main-page/index.tsx +++ b/src/features/summary-data/components/main-page-mini-card/index.tsx @@ -1,7 +1,7 @@ import { MiniCard } from "@/common/components/card" +import { useTodayElcGen } from "@/features/summary-data/hooks/uesTodayElcGen" import { useTodayRECData } from "@/features/summary-data/hooks/useTodayRECData" import { useTodaySMPData } from "@/features/summary-data/hooks/useTodaySMPData" -import { useTodayElcGen } from "@/features/summary-data/hooks/uesTodayElcGen" import { getMiniCardData } from "@/features/summary-data/utils/mainMiniCardUtils" export function MainPageSummaryCard() { diff --git a/src/features/summary-data/utils/mainMiniCardUtils.ts b/src/features/summary-data/utils/mainMiniCardUtils.ts index ffcc1ea..e1ea1eb 100644 --- a/src/features/summary-data/utils/mainMiniCardUtils.ts +++ b/src/features/summary-data/utils/mainMiniCardUtils.ts @@ -1,22 +1,15 @@ +import type { TElcGen } from "@/features/summary-data/types/TodayElcGen" import type { TRECData } from "@/features/summary-data/types/TodayREC" import type { TSMPData } from "@/features/summary-data/types/TodaySmp" -import type { TElcGen } from "@/features/summary-data/types/TodayElcGen" export function getMiniCardData( - todaySMPData: TSMPData[] | null, - todayRECData: TRECData[] | null, - todayElcGenData: TElcGen[] | null, + todaySMPData: TSMPData[], + todayRECData: TRECData[], + todayElcGenData: TElcGen[], ) { // 최신 및 이전 SMP 데이터 처리 - const recentSMPData: TSMPData | null = - todaySMPData && todaySMPData.length > 0 - ? todaySMPData[todaySMPData.length - 1] - : null - - const previousSMPData: TSMPData | null = - todaySMPData && todaySMPData.length > 1 - ? todaySMPData[todaySMPData.length - 2] - : null + const recentSMPData = todaySMPData[todaySMPData.length - 1] + const previousSMPData = todaySMPData[todaySMPData.length - 2] const smpDifference = recentSMPData && previousSMPData @@ -26,15 +19,8 @@ export function getMiniCardData( const smpAmount = Math.round(Math.abs(smpDifference) * 100) / 100 // 최신 및 이전 REC 데이터 처리 - const recentRECData: TRECData | null = - todayRECData && todayRECData.length > 0 - ? todayRECData[todayRECData.length - 1] - : null - - const previousRECData: TRECData | null = - todayRECData && todayRECData.length > 1 - ? todayRECData[todayRECData.length - 2] - : null + const recentRECData = todayRECData[todayRECData.length - 1] + const previousRECData = todayRECData[todayRECData.length - 2] const recDifference = recentRECData && previousRECData @@ -44,15 +30,8 @@ export function getMiniCardData( const recAmount = Math.round(Math.abs(recDifference) * 100) / 100 // 최신 및 이전 전력생산량 데이터 처리 - const recentElcGenData: TElcGen | null = - todayElcGenData && todayElcGenData.length > 0 - ? todayElcGenData[todayElcGenData.length - 1] - : null - - const previousElcGenData: TElcGen | null = - todayElcGenData && todayElcGenData.length > 1 - ? todayElcGenData[todayElcGenData.length - 2] - : null + const recentElcGenData = todayElcGenData[todayElcGenData.length - 1] + const previousElcGenData = todayElcGenData[todayElcGenData.length - 2] const elcGenDifference = recentElcGenData && previousElcGenData @@ -65,9 +44,7 @@ export function getMiniCardData( return [ { title: "일일전력생산량", - value: recentElcGenData - ? recentElcGenData.cumulative_generation_kwh - : "데이터 없음", + value: recentElcGenData?.cumulative_generation_kwh || "데이터 없음", unit: "Mwh", isIncreased: isElcGenIncreased, amount: elcGenAmount, @@ -83,7 +60,7 @@ export function getMiniCardData( }, { title: "SMP 현재가", - value: recentSMPData ? recentSMPData.Land : "데이터 없음", + value: recentSMPData?.Land || "데이터 없음", unit: "원/kWh", isIncreased: isSMPIncreased, amount: smpAmount, @@ -91,7 +68,7 @@ export function getMiniCardData( }, { title: "REC 현재가", - value: recentRECData ? recentRECData.closing_price : "데이터 없음", + value: recentRECData?.closing_price || "데이터 없음", unit: "원/REC", isIncreased: isRECIncreased, amount: recAmount,