refactoring

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

@@ -306,8 +306,8 @@ export class AdminService {
 
     if (isCurrency(symbol.replace(DEFAULT_CURRENCY, ''))) {
       currency = symbol.replace(DEFAULT_CURRENCY, '');
-      [activitiesCount, dateOfFirstActivity] =
+      ({ activitiesCount, dateOfFirstActivity } =
-        await this.orderService.getCountAndDateMin(currency);
+        await this.orderService.getStatisticsByCurrency(currency));
     }
 
     const [[assetProfile], marketData] = await Promise.all([
@@ -338,10 +338,10 @@ export class AdminService {
       marketData,
       assetProfile: assetProfile ?? {
         activitiesCount,
-        dateOfFirstActivity,
         currency,
         dataSource,
-        symbol
+        symbol,
+        dateOfFirstActivity
       }
     };
   }
@@ -437,8 +437,8 @@ export class AdminService {
 
           if (isCurrency(symbol.replace(DEFAULT_CURRENCY, ''))) {
             currency = symbol.replace(DEFAULT_CURRENCY, '');
-            [activitiesCount, dateOfFirstActivity] =
+            ({ activitiesCount, dateOfFirstActivity } =
-              await this.orderService.getCountAndDateMin(currency);
+              await this.orderService.getStatisticsByCurrency(currency));
           }
 
           const marketDataItemCount =
@@ -450,11 +450,11 @@ export class AdminService {
             })?._count ?? 0;
 
           return {
+            activitiesCount,
             currency,
             dataSource,
             marketDataItemCount,
             symbol,
-            activitiesCount,
             assetClass: AssetClass.LIQUIDITY,
             assetSubClass: AssetSubClass.CASH,
             countriesCount: 0,

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

@@ -546,9 +546,9 @@ export class OrderService {
     });
   }
 
-  public async getCountAndDateMin(
+  public async getStatisticsByCurrency(
     currency: EnhancedSymbolProfile['currency']
-  ): Promise<[number, Date]> {
+  ): Promise<{ activitiesCount: number; dateOfFirstActivity: Date }> {
     const { _count, _min } = await this.prismaService.order.aggregate({
       _count: true,
       _min: {
@@ -560,6 +560,6 @@ export class OrderService {
       _count as number;
     const dateOfFirstActivity: EnhancedSymbolProfile['dateOfFirstActivity'] =
       _min.date;
-    return [activitiesCount, dateOfFirstActivity];
+    return { activitiesCount, dateOfFirstActivity };
   }
 }