refactor applications for use accounts index

Author: cfaur09

src/common/indexer/elastic/elastic.indexer.service.ts

@@ -969,14 +969,11 @@ export class ElasticIndexerService implements IndexerInterface {
   async getApplications(filter: ApplicationFilter, pagination: QueryPagination): Promise<any[]> {
     const elasticQuery = this.indexerHelper.buildApplicationFilter(filter)
       .withPagination(pagination)
-      .withFields(['address', 'deployer', 'currentOwner', 'initialCodeHash', 'timestamp'])
-      .withSort([{ name: 'timestamp', order: ElasticSortOrder.descending }]);
-
-    return await this.elasticService.getList('scdeploys', 'address', elasticQuery);
-  }
+      .withMustExistCondition('currentOwner')
+      .withSort([{ name: 'api_transfersLast24h', order: ElasticSortOrder.descending }])
+      .withFields(['address', 'currentOwner', 'timestamp', 'api_transfersLast24h', 'balance']);
 
-  async getApplication(address: string): Promise<any> {
-    return await this.elasticService.getItem('scdeploys', 'address', address);
+    return await this.elasticService.getList('accounts', 'address', elasticQuery);
   }
 
   async getApplicationCount(filter: ApplicationFilter): Promise<number> {
@@ -985,23 +982,6 @@ export class ElasticIndexerService implements IndexerInterface {
     return await this.elasticService.getCount('scdeploys', elasticQuery);
   }
 
-  async getApplicationsBulkBalance(addresses: string[], pagination: QueryPagination): Promise<Record<string, { address: string, balance: string }>> {
-    const elasticQuery = ElasticQuery.create()
-      .withMustMultiShouldCondition(addresses, address => QueryType.Match('address', address, QueryOperator.AND))
-      .withFields(['address', 'balance', 'balanceNum'])
-      .withPagination(pagination);
-
-    const results = await this.elasticService.getList('accounts', 'address', elasticQuery);
-
-    return results.reduce((acc: Record<string, { address: string, balance: string }>, item: any) => {
-      acc[item.address] = {
-        address: item.address,
-        balance: item.balance || '0',
-      };
-      return acc;
-    }, {});
-  }
-
   async getAddressesWithTransfersLast24h(): Promise<string[]> {
     const elasticQuery = ElasticQuery.create()
       .withFields(['address'])

src/common/indexer/indexer.interface.ts

@@ -186,12 +186,8 @@ export interface IndexerInterface {
 
   getApplications(filter: ApplicationFilter, pagination: QueryPagination): Promise<any[]>
 
-  getApplicationsBulkBalance(addresses: string[], pagination: QueryPagination): Promise<Record<string, { address: string, balance: string }>>
-
   getApplicationCount(filter: ApplicationFilter): Promise<number>
 
-  getApplication(address: string): Promise<any>
-
   getAddressesWithTransfersLast24h(): Promise<string[]>
 
   getEvents(pagination: QueryPagination, filter: EventsFilter): Promise<Events[]>

src/common/indexer/indexer.service.ts

@@ -446,15 +446,6 @@ export class IndexerService implements IndexerInterface {
     return await this.indexerInterface.getApplications(filter, pagination);
   }
 
-  @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
-  async getApplicationsBulkBalance(addresses: string[], pagination: QueryPagination): Promise<Record<string, { address: string, balance: string }>> {
-    return await this.indexerInterface.getApplicationsBulkBalance(addresses, pagination);
-  }
-
-  @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
-  async getApplication(address: string): Promise<any> {
-    return await this.indexerInterface.getApplication(address);
-  }
 
   @LogPerformanceAsync(MetricsEvents.SetIndexerDuration)
   async getApplicationCount(filter: ApplicationFilter): Promise<number> {

src/endpoints/applications/application.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, DefaultValuePipe, Get, Param, Query } from "@nestjs/common";
+import { Controller, DefaultValuePipe, Get, NotFoundException, Param, Query } from "@nestjs/common";
 import { ApiOkResponse, ApiOperation, ApiQuery, ApiTags } from "@nestjs/swagger";
 import { ApplicationService } from "./application.service";
 import { QueryPagination } from "src/common/entities/query.pagination";
@@ -54,7 +54,11 @@ export class ApplicationController {
   @ApiOkResponse({ type: Application })
   async getApplication(
     @Param('address', ParseAddressPipe) address: string,
-  ): Promise<Application> {
+  ): Promise<Application | undefined> {
+    if (!address) {
+      throw new NotFoundException('Application not found');
+    }
+
     return await this.applicationService.getApplication(address);
   }
 }

src/endpoints/applications/application.service.ts

@@ -43,17 +43,15 @@ export class ApplicationService {
 
     const assets = await this.assetsService.getAllAccountAssets();
     const verifiedAccounts = await this.cacheService.get<string[]>(CacheInfo.VerifiedAccounts.key) || [];
-    const balances = await this.elasticIndexerService.getApplicationsBulkBalance(elasticResults.map(item => item.address), pagination);
 
     const applications = elasticResults.map(item => new Application({
       contract: item.address,
-      deployer: item.deployer,
       owner: item.currentOwner,
-      codeHash: item.initialCodeHash,
       timestamp: item.timestamp,
       assets: assets[item.address],
-      balance: balances[item.address]?.balance || '0',
+      balance: item.balance || '0',
       isVerified: verifiedAccounts.includes(item.address),
+      transfersLast24h: item.api_transfersLast24h || 0,
       ...(filter.withTxCount && { txCount: 0 }),
     }));
 
@@ -71,29 +69,17 @@ export class ApplicationService {
     return await this.elasticIndexerService.getApplicationCount(filter);
   }
 
-  async getApplication(address: string): Promise<Application> {
-    const indexResult = await this.elasticIndexerService.getApplication(address);
-    const assets = await this.assetsService.getAllAccountAssets();
-    const verifiedAccounts = await this.cacheService.get<string[]>(CacheInfo.VerifiedAccounts.key) || [];
-
+  async getApplication(address: string): Promise<Application | undefined> {
     const pagination = new QueryPagination({ from: 0, size: 1 });
-    const balances = await this.elasticIndexerService.getApplicationsBulkBalance([address], pagination);
-
-    const result = new Application({
-      contract: indexResult.address,
-      deployer: indexResult.deployer,
-      owner: indexResult.currentOwner,
-      codeHash: indexResult.initialCodeHash,
-      timestamp: indexResult.timestamp,
-      assets: assets[address],
-      balance: balances[address]?.balance || '0',
-      txCount: 0,
-      isVerified: verifiedAccounts.includes(address),
-    });
-
-    result.txCount = await this.getApplicationTxCount(result.contract);
-
-    return result;
+    const filter = new ApplicationFilter({ address });
+
+    const applications = await this.getApplicationsRaw(pagination, filter);
+
+    if (!applications || !applications.length) {
+      return undefined;
+    }
+
+    return applications.at(0);
   }
 
   private async getApplicationTxCount(address: string): Promise<number> {

src/endpoints/applications/entities/application.filter.ts

@@ -5,6 +5,7 @@ export class ApplicationFilter {
     Object.assign(this, init);
   }
 
+  address?: string;
   after?: number;
   before?: number;
   withTxCount?: boolean;
@@ -18,6 +19,7 @@ export class ApplicationFilter {
   isSet(): boolean {
     return this.after !== undefined ||
       this.before !== undefined ||
-      this.withTxCount !== undefined;
+      this.withTxCount !== undefined ||
+      this.address !== undefined;
   }
 }

src/endpoints/applications/entities/application.ts

@@ -9,9 +9,6 @@ export class Application {
   @ApiProperty({ type: String })
   contract: string = '';
 
-  @ApiProperty({ type: String })
-  deployer: string = '';
-
   @ApiProperty({ type: String })
   owner: string = '';
 
@@ -32,4 +29,7 @@ export class Application {
 
   @ApiProperty({ type: Boolean, required: false, description: 'Whether the application is verified' })
   isVerified?: boolean;
+
+  @ApiProperty({ type: Number, required: false, description: 'Number of transfers in the last 24 hours' })
+  transfersLast24h?: number;
 }