Revert "[BE] 7.07 거래 체결 기능 구현 (WebSocket) #53"

BE/src/stock/order/stock-order-socket.service.ts

@@ -89,7 +89,7 @@ export class StockOrderSocketService {
 
     const totalPrice = order.price * order.amount;
     const fee = this.calculateFee(totalPrice);
-    await this.stockOrderRepository.updateOrderAndAssetAndUserStockWhenBuy(
+    await this.stockOrderRepository.updateOrderAndAssetWhenBuy(
       order,
       totalPrice + fee,
     );
@@ -100,7 +100,7 @@ export class StockOrderSocketService {
 
     const totalPrice = order.price * order.amount;
     const fee = this.calculateFee(totalPrice);
-    await this.stockOrderRepository.updateOrderAndAssetAndUserStockWhenSell(
+    await this.stockOrderRepository.updateOrderAndAssetWhenSell(
       order,
       totalPrice - fee,
     );

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

@@ -7,15 +7,9 @@ import { StockOrderRepository } from './stock-order.repository';
 import { SocketModule } from '../../websocket/socket.module';
 import { AssetModule } from '../../asset/asset.module';
 import { StockOrderSocketService } from './stock-order-socket.service';
-import { UserStockModule } from '../../userStock/user-stock.module';
 
 @Module({
-  imports: [
-    TypeOrmModule.forFeature([Order]),
-    SocketModule,
-    AssetModule,
-    UserStockModule,
-  ],
+  imports: [TypeOrmModule.forFeature([Order]), SocketModule, AssetModule],
   controllers: [StockOrderController],
   providers: [StockOrderService, StockOrderRepository, StockOrderSocketService],
 })

BE/src/stock/order/stock-order.repository.ts

@@ -4,7 +4,6 @@ import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { Order } from './stock-order.entity';
 import { StatusType } from './enum/status-type';
 import { Asset } from '../../asset/asset.entity';
-import { UserStock } from '../../userStock/user-stock.entity';
 
 @Injectable()
 export class StockOrderRepository extends Repository<Order> {
@@ -18,7 +17,7 @@ export class StockOrderRepository extends Repository<Order> {
       .getRawMany();
   }
 
-  async updateOrderAndAssetAndUserStockWhenBuy(order, realPrice) {
+  async updateOrderAndAssetWhenBuy(order, realPrice) {
     const queryRunner = this.dataSource.createQueryRunner();
     await queryRunner.startTransaction();
 
@@ -33,32 +32,14 @@ export class StockOrderRepository extends Repository<Order> {
         .createQueryBuilder()
         .update(Asset)
         .set({
-          cash_balance: () => `cash_balance - ${realPrice}`,
-          total_asset: () => `total_asset - ${realPrice}`,
-          total_profit: () => `total_profit - ${realPrice}`,
+          cash_balance: () => 'cash_balance - :realPrice',
+          total_asset: () => 'total_asset - :realPrice',
+          total_profit: () => 'total_profit - :realPrice',
           total_profit_rate: () => `total_profit / 10000000`,
           last_updated: new Date(),
         })
         .where({ user_id: order.user_id })
-        .execute();
-
-      await queryRunner.manager
-        .createQueryBuilder()
-        .insert()
-        .into(UserStock)
-        .values({
-          user_id: order.user_id,
-          stock_code: order.stock_code,
-          quantity: order.amount,
-          avg_price: order.price,
-        })
-        .orUpdate(
-          [
-            `quantity = quantity + ${order.amount}`,
-            `avg_price = ((avg_price * quantity + ${order.price} * ${order.amount}) / (quantity + ${order.amount}))`,
-          ],
-          ['user_id', 'stock_code'],
-        )
+        .setParameter('realPrice', realPrice)
         .execute();
 
       await queryRunner.commitTransaction();
@@ -70,7 +51,7 @@ export class StockOrderRepository extends Repository<Order> {
     }
   }
 
-  async updateOrderAndAssetAndUserStockWhenSell(order, realPrice) {
+  async updateOrderAndAssetWhenSell(order, realPrice) {
     const queryRunner = this.dataSource.createQueryRunner();
     await queryRunner.startTransaction();
 
@@ -85,22 +66,14 @@ export class StockOrderRepository extends Repository<Order> {
         .createQueryBuilder()
         .update(Asset)
         .set({
-          cash_balance: () => `cash_balance + ${realPrice}`,
-          total_asset: () => `total_asset + ${realPrice}`,
-          total_profit: () => `total_profit + ${realPrice}`,
+          cash_balance: () => 'cash_balance + :realPrice',
+          total_asset: () => 'total_asset + :realPrice',
+          total_profit: () => 'total_profit + :realPrice',
           total_profit_rate: () => `total_profit / 10000000`,
           last_updated: new Date(),
         })
         .where({ user_id: order.user_id })
-        .execute();
-
-      await queryRunner.manager
-        .createQueryBuilder()
-        .update(UserStock)
-        .set({
-          quantity: () => `quantity - ${order.amount}`,
-        })
-        .where({ user_id: order.user_id, stock_code: order.stock_code })
+        .setParameter('realPrice', realPrice)
         .execute();
 
       await queryRunner.commitTransaction();

BE/src/stock/order/stock-order.service.ts

@@ -1,5 +1,4 @@
 import {
-  BadRequestException,
   ConflictException,
   ForbiddenException,
   Injectable,
@@ -10,14 +9,12 @@ import { StockOrderRepository } from './stock-order.repository';
 import { TradeType } from './enum/trade-type';
 import { StatusType } from './enum/status-type';
 import { StockOrderSocketService } from './stock-order-socket.service';
-import { UserStockRepository } from '../../userStock/user-stock.repository';
 
 @Injectable()
 export class StockOrderService {
   constructor(
     private readonly stockOrderRepository: StockOrderRepository,
     private readonly stockOrderSocketService: StockOrderSocketService,
-    private readonly userStockRepository: UserStockRepository,
   ) {}
 
   async buy(userId: number, stockOrderRequest: StockOrderRequestDto) {
@@ -35,14 +32,6 @@ export class StockOrderService {
   }
 
   async sell(userId: number, stockOrderRequest: StockOrderRequestDto) {
-    const userStock = await this.userStockRepository.findOneBy({
-      user_id: userId,
-      stock_code: stockOrderRequest.stock_code,
-    });
-
-    if (!userStock || userStock.quantity === 0)
-      throw new BadRequestException('주식을 매도 수만큼 가지고 있지 않습니다.');
-
     const order = this.stockOrderRepository.create({
       user_id: userId,
       stock_code: stockOrderRequest.stock_code,