Merge branch 'dev' of https://github.com/boostcampwm-2024/web16-JuGa …

…into dev
boostcampwm-2024 · Nov 27, 2024 · 45cc34d · 45cc34d
2 parents c87bd00 + a47f075
commit 45cc34d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/BE/src/asset/asset.controller.ts b/BE/src/asset/asset.controller.ts
@@ -89,4 +89,9 @@ export class AssetController {
   async updateAllAssets() {
     await this.assetService.updateAllAssets();
   }
+
+  @Cron('0 8 * * 1-5')
+  async updatePrevTotalAsset() {
+    await this.assetService.updatePrevTotalAsset();
+  }
 }
diff --git a/BE/src/asset/asset.service.ts b/BE/src/asset/asset.service.ts
@@ -125,7 +125,6 @@ export class AssetService {
       total_profit: asset.cash_balance + totalPrice - 10000000,
       total_profit_rate: (asset.cash_balance + totalPrice - 10000000) / 100000,
       last_updated: new Date(),
-      prev_total_asset: asset.total_asset,
     };
     return this.assetRepository.save(updatedAsset);
   }
@@ -162,4 +161,11 @@ export class AssetService {
       this.stockPriceSocketService.unsubscribeByCode(userStock.stock_code),
     );
   }
+
+  async updatePrevTotalAsset() {
+    await this.assetRepository.update(
+      {},
+      { prev_total_asset: () => 'total_asset' },
+    );
+  }
 }
diff --git a/BE/src/ranking/ranking.service.ts b/BE/src/ranking/ranking.service.ts
@@ -104,7 +104,7 @@ export class RankingService {
     };
   }
 
-  @Cron('0 16 * * 1-5')
+  @Cron('*/1 * * * 1-5')
   async updateRanking() {
     const [profitRateRanking, assetRanking] = await Promise.all([
       this.calculateRanking(SortType.PROFIT_RATE),

diff --git a/FE/src/components/Mypage/MyStocksList.tsx b/FE/src/components/Mypage/MyStocksList.tsx
@@ -1,3 +1,4 @@
+import { useNavigate } from 'react-router-dom';
 import { MyStockListUnit } from 'types';
 import { calcYield } from 'utils/common';
 
@@ -6,6 +7,12 @@ type MyStocksListProps = {
 };
 
 export default function MyStocksList({ stocks }: MyStocksListProps) {
+  const navigation = useNavigate();
+
+  const handleClick = (code: string) => {
+    navigation(`/stocks/${code}`);
+  };
+
   return (
     <div className='flex flex-col flex-1 w-full p-4 mx-auto bg-white rounded-md shadow-md'>
       <div className='flex pb-2 text-sm font-bold border-b'>
@@ -23,7 +30,11 @@ export default function MyStocksList({ stocks }: MyStocksListProps) {
           const stockYield = calcYield(avg_price, +stck_prpr);
 
           return (
-            <li className='flex py-2' key={code}>
+            <li
+              className='flex py-2 transition-colors hover:cursor-pointer hover:bg-gray-50'
+              key={code}
+              onClick={() => handleClick(code)}
+            >
               <div className='flex w-1/2 gap-2 text-left truncate'>
                 <p className='font-semibold'>{name}</p>
                 <p className='text-gray-500'>{code}</p>