🔧 fix: 이동 평균 관련 오류 수정 #192

이동편균선 5 또한 없을 수 있기 때문에 조건 수정.
boostcampwm-2024 · Nov 27, 2024 · 0fc4cfe · 0fc4cfe
1 parent 7e33d69
commit 0fc4cfe
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 23 deletions.
diff --git a/FE/src/types.ts b/FE/src/types.ts
@@ -38,7 +38,7 @@ export type StockChartUnit = {
   stck_lwpr: string;
   acml_vol: string;
   prdy_vrss_sign: string;
-  mov_avg_5: string;
+  mov_avg_5?: string;
   mov_avg_20?: string;
 };
 

diff --git a/FE/src/utils/chart/drawCandleChart.ts b/FE/src/utils/chart/drawCandleChart.ts
@@ -14,7 +14,7 @@ export function drawCandleChart(
 
   const values = data
     .map((d) => {
-      if (d.mov_avg_20) {
+      if (d.mov_avg_20 && d.mov_avg_5) {
         return [
           +d.stck_hgpr,
           +d.stck_lwpr,
@@ -23,14 +23,24 @@ export function drawCandleChart(
           Math.floor(+d.mov_avg_5),
           Math.floor(+d.mov_avg_20),
         ];
-      } else {
+      } else if (d.mov_avg_5) {
         return [
           +d.stck_hgpr,
           +d.stck_lwpr,
           +d.stck_clpr,
           +d.stck_oprc,
           Math.floor(+d.mov_avg_5),
         ];
+      } else if (d.mov_avg_20) {
+        return [
+          +d.stck_hgpr,
+          +d.stck_lwpr,
+          +d.stck_clpr,
+          +d.stck_oprc,
+          Math.floor(+d.mov_avg_20),
+        ];
+      } else {
+        return [+d.stck_hgpr, +d.stck_lwpr, +d.stck_clpr, +d.stck_oprc];
       }
     })
     .flat();

diff --git a/FE/src/utils/chart/drawLineChart.ts b/FE/src/utils/chart/drawLineChart.ts
@@ -20,7 +20,7 @@ export function drawLineChart(
 
   const values = data
     .map((d) => {
-      if (d.mov_avg_20) {
+      if (d.mov_avg_20 && d.mov_avg_5) {
         return [
           +d.stck_hgpr,
           +d.stck_lwpr,
@@ -29,32 +29,44 @@ export function drawLineChart(
           Math.floor(+d.mov_avg_5),
           Math.floor(+d.mov_avg_20),
         ];
-      } else {
+      } else if (d.mov_avg_5) {
         return [
           +d.stck_hgpr,
           +d.stck_lwpr,
           +d.stck_clpr,
           +d.stck_oprc,
           Math.floor(+d.mov_avg_5),
         ];
+      } else if (d.mov_avg_20) {
+        return [
+          +d.stck_hgpr,
+          +d.stck_lwpr,
+          +d.stck_clpr,
+          +d.stck_oprc,
+          Math.floor(+d.mov_avg_20),
+        ];
+      } else {
+        return [+d.stck_hgpr, +d.stck_lwpr, +d.stck_clpr, +d.stck_oprc];
       }
     })
     .flat();
   const yMax = Math.round(Math.max(...values) * (1 + weight));
   const yMin = Math.round(Math.min(...values) * (1 - weight));
 
   data.forEach((e, i) => {
-    const cx = x + padding.left + (width * i) / (n - 1) + gap / 2;
-    const cy =
-      y +
-      padding.top +
-      height -
-      (height * (+e.mov_avg_5 - yMin)) / (yMax - yMin);
+    if (e.mov_avg_5) {
+      const cx = x + padding.left + (width * i) / (n - 1) + gap / 2;
+      const cy =
+        y +
+        padding.top +
+        height -
+        (height * (+e.mov_avg_5 - yMin)) / (yMax - yMin);
 
-    if (i === 0) {
-      ctx.moveTo(cx, cy);
-    } else {
-      ctx.lineTo(cx, cy);
+      if (i === 0) {
+        ctx.moveTo(cx, cy);
+      } else {
+        ctx.lineTo(cx, cy);
+      }
     }
   });
   ctx.strokeStyle = '#000';

diff --git a/FE/src/utils/chart/drawUpperYAxis.ts b/FE/src/utils/chart/drawUpperYAxis.ts
@@ -15,14 +15,36 @@ export const drawUpperYAxis = (
   upperChartHeight: number,
 ) => {
   const values = data
-    .map((d) => [
-      +d.stck_hgpr,
-      +d.stck_lwpr,
-      +d.stck_clpr,
-      +d.stck_oprc,
-      Math.floor(+d.mov_avg_5),
-      Math.floor(+d.mov_avg_20),
-    ])
+    .map((d) => {
+      if (d.mov_avg_20 && d.mov_avg_5) {
+        return [
+          +d.stck_hgpr,
+          +d.stck_lwpr,
+          +d.stck_clpr,
+          +d.stck_oprc,
+          Math.floor(+d.mov_avg_5),
+          Math.floor(+d.mov_avg_20),
+        ];
+      } else if (d.mov_avg_5) {
+        return [
+          +d.stck_hgpr,
+          +d.stck_lwpr,
+          +d.stck_clpr,
+          +d.stck_oprc,
+          Math.floor(+d.mov_avg_5),
+        ];
+      } else if (d.mov_avg_20) {
+        return [
+          +d.stck_hgpr,
+          +d.stck_lwpr,
+          +d.stck_clpr,
+          +d.stck_oprc,
+          Math.floor(+d.mov_avg_20),
+        ];
+      } else {
+        return [+d.stck_hgpr, +d.stck_lwpr, +d.stck_clpr, +d.stck_oprc];
+      }
+    })
     .flat();
   const yMax = Math.round(Math.max(...values) * (1 + weight));
   const yMin = Math.round(Math.min(...values) * (1 - weight));