diff --git a/src/common/elastic.service.ts b/src/common/elastic.service.ts index ed3d92aee..97f1edbd7 100644 --- a/src/common/elastic.service.ts +++ b/src/common/elastic.service.ts @@ -93,16 +93,7 @@ export class ElasticService { }; async getAccountEsdtByIdentifier(identifier: string) { - const elasticQueryAdapter: ElasticQuery = new ElasticQuery(); - elasticQueryAdapter.condition.must = [ - QueryType.Match('identifier', identifier, QueryOperator.AND), - ] - - const elasticQuery = buildElasticQuery(elasticQueryAdapter); - - let documents = await this.getDocuments('accountsesdt', elasticQuery); - - return documents.map((document: any) => this.formatItem(document, 'identifier')); + return this.getAccountEsdtByIdentifiers([ identifier ]); } async getTokensByIdentifiers(identifiers: string[]) { @@ -126,12 +117,14 @@ export class ElasticService { pagination.size = 10000; elasticQueryAdapter.pagination = pagination; - const elasticQuery = buildElasticQuery(elasticQueryAdapter); - let documents = await this.getDocuments('accountsesdt', elasticQuery); + const documents = await this.getDocuments('accountsesdt', elasticQuery); - return documents.map((document: any) => this.formatItem(document, 'identifier')); + let result = documents.map((document: any) => this.formatItem(document, 'identifier')); + result.reverse(); + + return result; } async getAccountEsdtByAddress(address: string, from: number, size: number, token: string | undefined) { diff --git a/src/endpoints/nfts/nft.service.ts b/src/endpoints/nfts/nft.service.ts index 98b5d649b..3a4446f56 100644 --- a/src/endpoints/nfts/nft.service.ts +++ b/src/endpoints/nfts/nft.service.ts @@ -111,7 +111,6 @@ export class NftService { const { from, size } = queryPagination; let nfts = await this.getNftsInternal(from, size, filter, undefined); - if (withOwner) { const accountsEsdts = await this.elasticService.getAccountEsdtByIdentifiers(nfts.map(({identifier}) => identifier));