[Fix] 차트 갱신시간 오류 수정

- 차트 갱신시간 오류 수정 (연산자 수정) Issues #122
codestates-seb · Oct 3, 2023 · e9c2e3c · e9c2e3c
1 parent 211b2a7
commit e9c2e3c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/src/hooks/useGetStockChart.tsx b/client/src/hooks/useGetStockChart.tsx
@@ -40,7 +40,7 @@ const useGetStockChart = (companyId: number) => {
 
     const compareChartData = organizeData(data);
     const compareMovingAvgData = calculateMovingAvgLine(averageLineMinute, compareChartData);
-    const compareData = setComparedMovingAvgChart(`${compareName}`, compareMovingAvgData);
+    const compareData = setComparedMovingAvgChart(compareName, compareMovingAvgData);
     setCompare(compareData);
   };
 

diff --git a/client/src/hooks/useGetStockData.ts b/client/src/hooks/useGetStockData.ts
@@ -19,10 +19,10 @@ const useGetStockData = (companyId: number) => {
   const isAfter330PM = currentHour > 15 || (currentHour === 15 && currentMinute >= 30);
   const marketCloseTime = isBefore9AM || isAfter330PM;
 
-  const dataRenewalTime = isBusinessDay || !marketCloseTime;
+  const dataRenewalTime = isBusinessDay && !marketCloseTime;
 
   // 시간대 (timeZone) 별로 queryKey를 다르게 설정해서, 서버 데이터가 동일할 때는 캐싱된 데이터 활용하고 서버 데이터가 갱신됐을 때는 새롭게 받아옴 (서버 데이터 30분마다 갱신)
-  const [month, day, hour, minute] = [currentTime.getMonth(), currentTime.getDate(), currentTime.getHours(), currentTime.getMinutes()];
+  const [month, day, hour, minute] = [currentTime.getMonth() + 1, currentTime.getDate(), currentTime.getHours(), currentTime.getMinutes()];
   const timeZone = minute === 0 || minute === 30 ? "30 or 60" : 0 < minute && minute < 30 ? "1~29" : "31~59";
   const queryKey = dataRenewalTime ? `chartData${companyId} ${month}월 ${day}일 ${hour}시 ${timeZone}` : `chartData${companyId}`;
 

diff --git a/client/src/hooks/useGetStockInfo.ts b/client/src/hooks/useGetStockInfo.ts
@@ -19,7 +19,7 @@ const useGetStockInfo = (companyId: number) => {
   const isAfter330PM = currentHour > 15 || (currentHour === 15 && currentMinute >= 30);
   const marketCloseTime = isBefore9AM || isAfter330PM;
 
-  const dataRenewalTime = isBusinessDay || !marketCloseTime;
+  const dataRenewalTime = isBusinessDay && !marketCloseTime;
 
   // 시간대 (timeZone) 별로 queryKey를 다르게 설정해서, 서버 데이터가 동일할 때는 캐싱된 데이터 활용하고 서버 데이터가 갱신됐을 때는 새롭게 받아옴 (서버 데이터 30분마다 갱신)
   const [month, day, hour, minute] = [currentTime.getMonth(), currentTime.getDate(), currentTime.getHours(), currentTime.getMinutes()];