Feature/#332 - 누락된 최신 차트데이터가 존재하면 API 요청 후 차트데이터 전달

packages/backend/src/scraper/openapi/api/openapiPeriodData.api.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Cron } from '@nestjs/schedule';
-import { DataSource } from 'typeorm';
+import { DataSource, QueryFailedError } from 'typeorm';
 import { Logger } from 'winston';
 import {
   ChartData,
@@ -10,11 +10,7 @@ import {
 } from '../type/openapiPeriodData.type';
 import { TR_IDS } from '../type/openapiUtil.type';
 import { NewDate } from '../util/newDate.util';
-import {
-  getOpenApi,
-  getPreviousDate,
-  getTodayDate,
-} from '../util/openapiUtil.api';
+import { getPreviousDate, getTodayDate } from '../util/openapiUtil.api';
 import { OpenapiTokenApi } from './openapiToken.api';
 import { Json, OpenapiQueue } from '@/scraper/openapi/queue/openapi.queue';
 import { Stock } from '@/stock/domain/stock.entity';
@@ -33,15 +29,13 @@ const DATE_TO_ENTITY = {
   Y: StockYearly,
 } as const;
 
-const DATE_TO_MONTH = {
+export const DATE_TO_MONTH = {
   D: 1,
   W: 6,
   M: 24,
   Y: 120,
 } as const;
 
-const INTERVALS = 10000;
-
 @Injectable()
 export class OpenapiPeriodData {
   private readonly url: string =
@@ -69,6 +63,53 @@ export class OpenapiPeriodData {
     await this.getChartData(stocks, 'D');
   }
 
+  getInsertCartDataRequestCallback(
+    resolve: (value: StockData[]) => void,
+    stockId: string,
+    period: Period,
+  ) {
+    return async (data: Json) => {
+      if (!data.output2 || !Array.isArray(data.output2)) return resolve([]);
+      const result = data.output2
+        .reduce((acc: StockData[], item: Record<string, string>) => {
+          if (!isChartData(item)) return acc;
+          const stockData = this.convertObjectToStockData(item, stockId);
+          acc.push(stockData);
+          this.insertChartData(stockData, period).catch((e) => {
+            if (
+              e instanceof QueryFailedError &&
+              e.driverError.message.includes('duplicate')
+            ) {
+              this.logger.warn(
+                `when insert missing chart data, duplicate error :${stockId}`,
+              );
+              return;
+            }
+            this.logger.error(e);
+          });
+          return acc;
+        }, [])
+        .reverse();
+      resolve(result);
+    };
+  }
+
+  insertCartDataRequest(
+    resolve: (value: StockData[]) => void,
+    stockId: string,
+    period: Period,
+  ): void {
+    const end = getTodayDate();
+    const start = getPreviousDate(end, DATE_TO_MONTH[period]);
+    const query = this.getItemChartPriceQuery(stockId, start, end, period);
+    this.openApiQueue.enqueue({
+      url: this.url,
+      query,
+      trId: TR_IDS.ITEM_CHART_PRICE,
+      callback: this.getInsertCartDataRequestCallback(resolve, stockId, period),
+    });
+  }
+
   /**
    * 월, 년의 경우 마지막 데이터를 업데이트 하는 형식으로 변경해야됨
    */
@@ -104,21 +145,6 @@ export class OpenapiPeriodData {
     });
   }
 
-  private async fetchChartData(query: ItemChartPriceQuery, configIdx: number) {
-    try {
-      const response = await getOpenApi(
-        this.url,
-        (await this.openApiToken.configs())[configIdx],
-        query,
-        TR_IDS.ITEM_CHART_PRICE,
-      );
-      return response.output2 as ChartData[];
-    } catch (error) {
-      this.logger.warn(error);
-      setTimeout(() => this.fetchChartData(query, configIdx), INTERVALS / 10);
-    }
-  }
-
   private updateDates(
     endDate: string,
     period: Period,

packages/backend/src/scraper/openapi/openapi-scraper.module.ts

@@ -42,7 +42,6 @@ import { StockLiveData } from '@/stock/domain/stockLiveData.entity';
   ],
   controllers: [],
   providers: [
-    LiveData,
     OpenapiLiveData,
     OpenapiTokenApi,
     OpenapiPeriodData,
@@ -56,6 +55,6 @@ import { StockLiveData } from '@/stock/domain/stockLiveData.entity';
     WebsocketClient,
     LiveData,
   ],
-  exports: [LiveData],
+  exports: [LiveData, OpenapiPeriodData],
 })
 export class OpenapiScraperModule {}

packages/backend/src/scraper/openapi/type/openapiPeriodData.type.ts

@@ -25,7 +25,7 @@ export type ItemChartPriceQuery = {
   fid_org_adj_prc: number;
 };
 
-export const isChartData = (data?: any) => {
+export const isChartData = (data?: any): data is ChartData => {
   return (
     data &&
     typeof data === 'object' &&

packages/backend/src/scraper/openapi/util/newDate.util.ts

@@ -15,30 +15,6 @@ export class NewDate extends Date {
     );
   }
 
-  private resetTime(): NewDate {
-    this.setHours(0, 0, 0, 0);
-    return this;
-  }
-
-  private getWeek(): number {
-    const date = this.resetTime();
-    const firstOne = new Date(date.getFullYear(), 0, 1);
-    return Math.ceil(
-      ((date.getTime() - firstOne.getTime()) / 86400000 +
-        firstOne.getDay() +
-        1) /
-        7,
-    );
-  }
-
-  private isLastWeekOfTheYear(): boolean {
-    return this.getWeek() === 53;
-  }
-
-  private isFirstWeekOfTheYear(): boolean {
-    return this.getWeek() === 1;
-  }
-
   dateToNewDate(date: Date): NewDate {
     return new NewDate(date);
   }
@@ -77,4 +53,36 @@ export class NewDate extends Date {
   isSameYear(dateToCompare: NewDate | Date): boolean {
     return this.getFullYear() === dateToCompare.getFullYear();
   }
+
+  isSameDate(dateToCompare: NewDate | Date): boolean {
+    return (
+      this.getFullYear() === dateToCompare.getFullYear() &&
+      this.getMonth() === dateToCompare.getMonth() &&
+      this.getDate() === dateToCompare.getDate()
+    );
+  }
+
+  private resetTime(): NewDate {
+    this.setHours(0, 0, 0, 0);
+    return this;
+  }
+
+  private getWeek(): number {
+    const date = this.resetTime();
+    const firstOne = new Date(date.getFullYear(), 0, 1);
+    return Math.ceil(
+      ((date.getTime() - firstOne.getTime()) / 86400000 +
+        firstOne.getDay() +
+        1) /
+        7,
+    );
+  }
+
+  private isLastWeekOfTheYear(): boolean {
+    return this.getWeek() === 53;
+  }
+
+  private isFirstWeekOfTheYear(): boolean {
+    return this.getWeek() === 1;
+  }
 }

packages/backend/src/stock/constants/timeunit.ts

@@ -0,0 +1,9 @@
+export const TIME_UNIT = {
+  MINUTE: 'minute',
+  DAY: 'day',
+  WEEK: 'week',
+  MONTH: 'month',
+  YEAR: 'year',
+} as const;
+
+export type TIME_UNIT = (typeof TIME_UNIT)[keyof typeof TIME_UNIT];

packages/backend/src/stock/dto/stockData.response.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
+import { StockData } from '@/stock/domain/stockData.entity';
 
 export class PriceDto {
   @ApiProperty({
@@ -33,6 +34,14 @@ export class PriceDto {
     example: '123.45',
   })
   close: number;
+
+  constructor(stockData: StockData) {
+    this.startTime = stockData.startTime;
+    this.open = stockData.open;
+    this.high = stockData.high;
+    this.low = stockData.low;
+    this.close = stockData.close;
+  }
 }
 
 export class VolumeDto {
@@ -49,6 +58,11 @@ export class VolumeDto {
     example: 1000,
   })
   volume: number;
+
+  constructor(stockData: StockData) {
+    this.startTime = stockData.startTime;
+    this.volume = stockData.volume;
+  }
 }
 
 export class StockDataResponse {
@@ -71,4 +85,14 @@ export class StockDataResponse {
     example: true,
   })
   hasMore: boolean;
+
+  constructor(
+    priceDtoList: PriceDto[],
+    volumeDtoList: VolumeDto[],
+    hasMore: boolean,
+  ) {
+    this.priceDtoList = priceDtoList;
+    this.volumeDtoList = volumeDtoList;
+    this.hasMore = hasMore;
+  }
 }

packages/backend/src/stock/stock.controller.ts

@@ -23,18 +23,12 @@ import { ApiGetStockData } from './decorator/stockData.decorator';
 import { StockDetailResponse } from './dto/stockDetail.response';
 import { StockIndexRateResponse } from './dto/stockIndexRate.response';
 import { StockService } from './stock.service';
-import {
-  StockDataDailyService,
-  StockDataMinutelyService,
-  StockDataMonthlyService,
-  StockDataWeeklyService,
-  StockDataYearlyService,
-} from './stockData.service';
 import { StockDetailService } from './stockDetail.service';
 import { StockRateIndexService } from './stockRateIndex.service';
 import SessionGuard from '@/auth/session/session.guard';
 import { GetUser } from '@/common/decorator/user.decorator';
 import { sessionConfig } from '@/configs/session.config';
+import { TIME_UNIT } from '@/stock/constants/timeunit';
 import { StockSearchRequest } from '@/stock/dto/stock.request';
 import {
   StockRankResponses,
@@ -52,16 +46,13 @@ import {
   UserStocksResponse,
 } from '@/stock/dto/userStock.response';
 import { User } from '@/user/domain/user.entity';
-
-const TIME_UNIT = {
-  MINUTE: 'minute',
-  DAY: 'day',
-  WEEK: 'week',
-  MONTH: 'month',
-  YEAR: 'year',
-} as const;
-
-type TIME_UNIT = (typeof TIME_UNIT)[keyof typeof TIME_UNIT];
+import { StockDataService } from '@/stock/stockData.service';
+import {
+  StockDaily,
+  StockMonthly,
+  StockWeekly,
+  StockYearly,
+} from '@/stock/domain/stockData.entity';
 
 const FLUCTUATION_TYPE = {
   INCREASE: 'increase',
@@ -76,13 +67,9 @@ type FLUCTUATION_TYPE =
 export class StockController {
   constructor(
     private readonly stockService: StockService,
-    private readonly stockDataMinutelyService: StockDataMinutelyService,
-    private readonly stockDataDailyService: StockDataDailyService,
-    private readonly stockDataWeeklyService: StockDataWeeklyService,
-    private readonly stockDataMonthlyService: StockDataMonthlyService,
-    private readonly stockDataYearlyService: StockDataYearlyService,
     private readonly stockDetailService: StockDetailService,
     private readonly stockRateIndexService: StockRateIndexService,
+    private readonly stockDataService: StockDataService,
   ) {}
 
   @HttpCode(200)
@@ -289,11 +276,9 @@ export class StockController {
   async getStockDataDaily(
     @Param('stockId') stockId: string,
     @Query('lastStartTime') lastStartTime?: string,
-    @Query('timeunit') timeunit: TIME_UNIT = TIME_UNIT.MINUTE,
+    @Query('timeunit') timeunit: TIME_UNIT = TIME_UNIT.DAY,
   ) {
     switch (timeunit) {
-      case TIME_UNIT.MINUTE:
-        return this.getMinutelyData(stockId, lastStartTime);
       case TIME_UNIT.DAY:
         return this.getDailyData(stockId, lastStartTime);
       case TIME_UNIT.MONTH:
@@ -309,7 +294,8 @@ export class StockController {
     stockId: string,
     lastStartTime: string | undefined,
   ) {
-    return this.stockDataYearlyService.getStockDataYearly(
+    return this.stockDataService.getPaginated(
+      StockYearly,
       stockId,
       lastStartTime,
     );
@@ -319,7 +305,8 @@ export class StockController {
     stockId: string,
     lastStartTime: string | undefined,
   ) {
-    return this.stockDataWeeklyService.getStockDataWeekly(
+    return this.stockDataService.getPaginated(
+      StockWeekly,
       stockId,
       lastStartTime,
     );
@@ -329,20 +316,18 @@ export class StockController {
     stockId: string,
     lastStartTime: string | undefined,
   ) {
-    return this.stockDataMonthlyService.getStockDataMonthly(
+    return this.stockDataService.getPaginated(
+      StockMonthly,
       stockId,
       lastStartTime,
     );
   }
 
-  private getMinutelyData(stockId: string, lastStartTime?: string) {
-    return this.stockDataMinutelyService.getStockDataMinutely(
+  private getDailyData(stockId: string, lastStartTime?: string) {
+    return this.stockDataService.getPaginated(
+      StockDaily,
       stockId,
       lastStartTime,
     );
   }
-
-  private getDailyData(stockId: string, lastStartTime?: string) {
-    return this.stockDataDailyService.getStockDataDaily(stockId, lastStartTime);
-  }
 }