Refactoring

apps/api/src/app/admin/admin.service.ts

@@ -205,8 +205,6 @@ export class AdminService {
     sortDirection?: Prisma.SortOrder;
     take?: number;
   }): Promise<AdminMarketData> {
-    const MARKET_DATA_QUERY_SYMBOL_CHUNK_SIZE = 5000;
-
     let orderBy: Prisma.Enumerable<Prisma.SymbolProfileOrderByWithRelationInput> =
       [{ symbol: 'asc' }];
     const where: Prisma.SymbolProfileWhereInput = {};
@@ -227,7 +225,7 @@ export class AdminService {
       presetId === 'ETF_WITHOUT_SECTORS'
     ) {
       filters = [{ id: 'ETF', type: 'ASSET_SUB_CLASS' }];
-    } else if (presetId === 'WITHOUT_ACTIVITIES') {
+    } else if (presetId === 'NO_ACTIVITIES') {
       where.activities = {
         none: {}
       };
@@ -322,28 +320,7 @@ export class AdminService {
       const assetProfiles = symbolProfileResult[0];
       let count = symbolProfileResult[1];
 
-      const dataSources = [
+      const lastMarketPrices = await this.prismaService.marketData.findMany({
-        ...new Set(assetProfiles.map(({ dataSource }) => dataSource))
-      ];
-      const symbols = [...new Set(assetProfiles.map(({ symbol }) => symbol))];
-      const symbolChunks: string[][] = [];
-
-      for (
-        let chunkStartIndex = 0;
-        chunkStartIndex < symbols.length;
-        chunkStartIndex += MARKET_DATA_QUERY_SYMBOL_CHUNK_SIZE
-      ) {
-        symbolChunks.push(
-          symbols.slice(
-            chunkStartIndex,
-            chunkStartIndex + MARKET_DATA_QUERY_SYMBOL_CHUNK_SIZE
-          )
-        );
-      }
-
-      const lastMarketPriceResults = await Promise.all(
-        symbolChunks.map((symbolChunk) => {
-          return this.prismaService.marketData.findMany({
         distinct: ['dataSource', 'symbol'],
         orderBy: { date: 'desc' },
         select: {
@@ -353,16 +330,17 @@ export class AdminService {
         },
         where: {
           dataSource: {
-                in: dataSources
+            in: assetProfiles.map(({ dataSource }) => {
+              return dataSource;
+            })
           },
           symbol: {
-                in: symbolChunk
+            in: assetProfiles.map(({ symbol }) => {
+              return symbol;
+            })
           }
         }
       });
-        })
-      );
-      const lastMarketPrices = lastMarketPriceResults.flat();
 
       const lastMarketPriceMap = new Map<string, number>();
 
@@ -459,15 +437,17 @@ export class AdminService {
         )
       );
 
+      if (presetId) {
         if (presetId === 'ETF_WITHOUT_COUNTRIES') {
           marketData = marketData.filter(({ countriesCount }) => {
             return countriesCount === 0;
           });
-        count = marketData.length;
         } else if (presetId === 'ETF_WITHOUT_SECTORS') {
           marketData = marketData.filter(({ sectorsCount }) => {
             return sectorsCount === 0;
           });
+        }
+
         count = marketData.length;
       }
 

apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@@ -142,8 +142,8 @@ export class GfAdminMarketDataComponent
       type: 'PRESET_ID' as Filter['type']
     },
     {
-      id: 'WITHOUT_ACTIVITIES',
+      id: 'NO_ACTIVITIES',
-      label: $localize`Without Activities`,
+      label: $localize`No Activities`,
       type: 'PRESET_ID' as Filter['type']
     }
   ];

libs/common/src/lib/types/market-data-preset.type.ts

@@ -3,4 +3,4 @@ export type MarketDataPreset =
   | 'CURRENCIES'
   | 'ETF_WITHOUT_COUNTRIES'
   | 'ETF_WITHOUT_SECTORS'
-  | 'WITHOUT_ACTIVITIES';
+  | 'NO_ACTIVITIES';