[BE] 실제 서버 내에서 테스트를 위한 머지

.github/workflows/deply-alpha.yml → .github/workflows/deploy-alpha.yml

@@ -17,10 +17,7 @@ jobs:
       max-parallel: 1
       matrix:
         app:
-          [
-            { name: 'be', dir: 'BE', port: 3000, container: 'juga-docker-be' },
-            { name: 'fe', dir: 'FE', port: 5173, container: 'juga-docker-fe' },
-          ]
+          [{ name: 'be', dir: 'BE', port: 3000, container: 'juga-docker-be' }]
 
     steps:
       - uses: actions/checkout@v4
@@ -35,11 +32,7 @@ jobs:
       - name: Create .env file
         run: |
           touch ./${{ matrix.app.dir }}/.env
-          if [ "${{ matrix.app.name }}" = "be" ]; then
-            echo "${{ secrets.ENV }}" > ./${{matrix.app.dir}}/.env
-          else
-            echo "${{ secrets.ENV_FE }}" > ./${{matrix.app.dir}}/.env
-          fi
+          echo "${{ secrets.ENV_ALPHA }}" > ./${{matrix.app.dir}}/.env
 
       - name: Install dependencies
         working-directory: ./${{matrix.app.dir}}
@@ -108,12 +101,7 @@ jobs:
           port: 22
           script: |
             docker system prune -af
-            if [ "${{ matrix.app.name }}" = "be" ]; then
-              echo "${{ secrets.ENV }}" > .env
-            else
-              echo "${{ secrets.ENV_FE }}" > .env
-            fi
-
+            echo "${{ secrets.ENV_ALPHA }}" > .env
 
             docker network create juga-network || true
 

BE/Dockerfile

@@ -12,6 +12,7 @@ WORKDIR /var/app
 COPY package*.json ./
 RUN npm install --only=production
 COPY --from=builder /app/dist ./dist
+RUN ln -snf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
 
 EXPOSE 3000
 CMD ["node", "dist/main.js"]

BE/src/app.module.ts

@@ -8,8 +8,8 @@ import { AppService } from './app.service';
 import { AuthModule } from './auth/auth.module';
 import { StockIndexModule } from './stock/index/stock-index.module';
 import { StockTopfiveModule } from './stock/topfive/stock-topfive.module';
-import { KoreaInvestmentModule } from './koreaInvestment/korea-investment.module';
-import { SocketModule } from './websocket/socket.module';
+import { KoreaInvestmentModule } from './common/koreaInvestment/korea-investment.module';
+import { SocketModule } from './common/websocket/socket.module';
 import { StockOrderModule } from './stock/order/stock-order.module';
 import { StockDetailModule } from './stock/detail/stock-detail.module';
 import { typeOrmConfig } from './configs/typeorm.config';

BE/src/auth/auth.controller.ts

@@ -38,18 +38,12 @@ export class AuthController {
     const { accessToken, refreshToken } =
       await this.authService.loginUser(authCredentialsDto);
 
+    res.cookie('accessToken', accessToken, { httpOnly: true });
     res.cookie('refreshToken', refreshToken, { httpOnly: true });
     res.cookie('isRefreshToken', true, { httpOnly: true });
     return res.status(200).json({ accessToken });
   }
 
-  @ApiOperation({ summary: 'Token 인증 테스트 API' })
-  @Get('/test')
-  @UseGuards(AuthGuard('jwt'))
-  test(@Req() req: Request) {
-    return req;
-  }
-
   @ApiOperation({ summary: 'Kakao 로그인 API' })
   @Get('/kakao')
   @UseGuards(AuthGuard('kakao'))

BE/src/auth/strategy/jwt.strategy.ts

@@ -1,11 +1,26 @@
 import { PassportStrategy } from '@nestjs/passport';
 import { InjectRepository } from '@nestjs/typeorm';
-import { ExtractJwt, Strategy } from 'passport-jwt';
+import { Strategy } from 'passport-jwt';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { Request } from 'express';
 import { UserRepository } from '../user.repository';
 import { User } from '../user.entity';
 
+interface RequestWithCookies extends Request {
+  cookies: {
+    accessToken?: string;
+    [key: string]: string | undefined;
+  };
+}
+
+function extractJWTFromCookie(req: RequestWithCookies): string | null {
+  if (req.cookies && 'accessToken' in req.cookies) {
+    return req.cookies.accessToken;
+  }
+  return null;
+}
+
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
   constructor(
@@ -14,11 +29,16 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   ) {
     super({
       secretOrKey: configService.get<string>('JWT_SECRET'),
-      jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
+      jwtFromRequest: extractJWTFromCookie,
     });
   }
 
-  async validate(payload) {
+  async validate(payload: { email: string }): Promise<{
+    userId: number;
+    email: string;
+    tutorial: boolean;
+    kakaoId: string | null;
+  }> {
     const { email } = payload;
     const user: User = await this.userRepository.findOne({ where: { email } });
     if (!user) throw new UnauthorizedException();

BE/src/koreaInvestment/korea-investment.service.ts → BE/src/common/koreaInvestment/korea-investment.domain-service.ts

@@ -1,9 +1,10 @@
 import axios from 'axios';
 import { UnauthorizedException } from '@nestjs/common';
-import { getFullURL } from '../util/get-full-URL';
+import { getFullURL } from '../../util/get-full-URL';
 import { AccessTokenInterface } from './interface/korea-investment.interface';
+import { getHeader } from '../../util/get-header';
 
-export class KoreaInvestmentService {
+export class KoreaInvestmentDomainService {
   private accessToken: string;
   private tokenExpireTime: Date;
 
@@ -29,4 +30,30 @@ export class KoreaInvestmentService {
 
     return this.accessToken;
   }
+
+  /**
+   * @private 한국투자 Open API - API 호출용 공통 함수
+   * @param {string} trId - API 호출에 사용할 tr_id
+   * @param {string} apiURL - API 호출에 사용할 URL
+   * @param {Record<string, string>} params - API 요청 시 필요한 쿼리 파라미터 DTO
+   * @returns - API 호출에 대한 응답 데이터
+   *
+   * @author uuuo3o
+   */
+  async requestApi<T>(
+    trId: string,
+    apiURL: string,
+    params: Record<string, string>,
+  ): Promise<T> {
+    const accessToken = await this.getAccessToken();
+    const headers = getHeader(accessToken, trId);
+    const url = getFullURL(apiURL);
+
+    const response = await axios.get<T>(url, {
+      headers,
+      params,
+    });
+
+    return response.data;
+  }
 }

BE/src/common/koreaInvestment/korea-investment.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { KoreaInvestmentDomainService } from './korea-investment.domain-service';
+
+@Module({
+  imports: [],
+  controllers: [],
+  providers: [KoreaInvestmentDomainService],
+  exports: [KoreaInvestmentDomainService],
+})
+export class KoreaInvestmentModule {}

BE/src/websocket/base-socket.service.ts → BE/src/common/websocket/base-socket.domain-service.ts

@@ -5,10 +5,10 @@ import {
   Logger,
   OnModuleInit,
 } from '@nestjs/common';
-import { SocketTokenService } from './socket-token.service';
+import { SocketTokenDomainService } from './socket-token.domain-service';
 
 @Injectable()
-export class BaseSocketService implements OnModuleInit {
+export class BaseSocketDomainService implements OnModuleInit {
   private socket: WebSocket;
   private socketConnectionKey: string;
   private socketOpenHandlers: (() => void | Promise<void>)[] = [];
@@ -18,11 +18,13 @@ export class BaseSocketService implements OnModuleInit {
 
   private readonly logger = new Logger();
 
-  constructor(private readonly socketTokenService: SocketTokenService) {}
+  constructor(
+    private readonly socketTokenDomainService: SocketTokenDomainService,
+  ) {}
 
   async onModuleInit() {
     this.socketConnectionKey =
-      await this.socketTokenService.getSocketConnectionKey();
+      await this.socketTokenDomainService.getSocketConnectionKey();
     this.socket = new WebSocket(process.env.KOREA_INVESTMENT_SOCKET_URL);
 
     this.socket.onopen = () => {
@@ -63,6 +65,11 @@ export class BaseSocketService implements OnModuleInit {
 
     this.socket.onclose = () => {
       this.logger.warn(`한국투자증권 소켓 연결 종료`);
+      setTimeout(() => {
+        this.onModuleInit().catch((err) => {
+          throw new InternalServerErrorException(err);
+        });
+      }, 60000);
     };
   }
 

BE/src/websocket/socket-token.service.ts → BE/src/common/websocket/socket-token.domain-service.ts

@@ -1,8 +1,8 @@
 import axios from 'axios';
 import { SocketConnectTokenInterface } from './interface/socket.interface';
-import { getFullURL } from '../util/get-full-URL';
+import { getFullURL } from '../../util/get-full-URL';
 
-export class SocketTokenService {
+export class SocketTokenDomainService {
   private approvalKey: string;
 
   async getSocketConnectionKey() {

BE/src/websocket/socket.gateway.ts → BE/src/common/websocket/socket.gateway.ts

@@ -20,4 +20,8 @@ export class SocketGateway {
 
     this.server.emit(event, stockIndexValue);
   }
+
+  sendStockTradeHistoryValueToClient(event, chartData) {
+    this.server.emit(event, chartData);
+  }
 }

BE/src/common/websocket/socket.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { SocketGateway } from './socket.gateway';
+import { SocketTokenDomainService } from './socket-token.domain-service';
+import { BaseSocketDomainService } from './base-socket.domain-service';
+
+@Module({
+  providers: [SocketTokenDomainService, SocketGateway, BaseSocketDomainService],
+  exports: [SocketGateway, BaseSocketDomainService],
+})
+export class SocketModule {}

BE/src/main.ts

@@ -20,6 +20,7 @@ async function bootstrap() {
     methods: 'GET, HEAD, PUT, PATH, POST, DELETE',
     preflightContinue: false,
     optionsSuccessStatus: 204,
+    credentials: true,
   });
 
   app.use(cookieParser());

BE/src/stock/detail/dto/stock-detail-response.dto.ts

@@ -24,4 +24,10 @@ export class InquirePriceResponseDto {
 
   @ApiProperty({ description: 'PER' })
   per: string;
+
+  @ApiProperty({ description: '주식 상한가' })
+  stck_mxpr: string;
+
+  @ApiProperty({ description: '주식 하한가' })
+  stck_llam: string;
 }

BE/src/stock/detail/stock-detail.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { KoreaInvestmentModule } from '../../koreaInvestment/korea-investment.module';
+import { KoreaInvestmentModule } from '../../common/koreaInvestment/korea-investment.module';
 import { StockDetailController } from './stock-detail.controller';
 import { StockDetailService } from './stock-detail.service';
 import { StockDetailRepository } from './stock-detail.repository';