Merge pull request #1554 from multiversx/MEX-662-trading-activity-for…

…-tokens-and-pairs [MEX-662]: Filter by pair address in ES query
multiversx · Jan 31, 2025 · 8490787 · 8490787
2 parents 39a66ce + 6841761
commit 8490787
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 45 deletions.
diff --git a/src/modules/analytics/services/analytics.compute.service.ts b/src/modules/analytics/services/analytics.compute.service.ts
@@ -283,8 +283,8 @@ export class AnalyticsComputeService {
     @ErrorLoggerAsync()
     @GetOrSetCache({
         baseKey: 'analytics',
-        remoteTtl: Constants.oneMinute() * 2,
-        localTtl: Constants.oneMinute(),
+        remoteTtl: Constants.oneMinute() * 5,
+        localTtl: Constants.oneMinute() * 3,
     })
     async pairTradingActivity(
         pairAddress: string,
@@ -295,8 +295,8 @@ export class AnalyticsComputeService {
     @ErrorLoggerAsync()
     @GetOrSetCache({
         baseKey: 'analytics',
-        remoteTtl: Constants.oneMinute() * 2,
-        localTtl: Constants.oneMinute(),
+        remoteTtl: Constants.oneMinute() * 5,
+        localTtl: Constants.oneMinute() * 3,
     })
     async tokenTradingActivity(
         tokenID: string,
@@ -385,40 +385,24 @@ export class AnalyticsComputeService {
     async computeTokenTradingActivity(
         tokenID: string,
     ): Promise<TradingActivityModel[]> {
-        const filteredEvents: RawElasticEventType[] = [];
-        const pairsAddresses = await this.routerAbi.pairsAddress();
-        let latestTimestamp = Math.floor(Date.now() / 1000);
-        const size = 50;
+        let filteredEvents: RawElasticEventType[] = [];
+        const pairsMetadata = await this.routerAbi.pairsMetadata();
 
-        const createUniqueIdentifier = (event: RawElasticEventType) => {
-            return `${event.txHash}-${event.shardID}-${event.order}`;
-        };
+        const pairsAddresses = pairsMetadata
+            .filter(
+                (pair) =>
+                    pair.firstTokenID === tokenID ||
+                    pair.secondTokenID === tokenID,
+            )
+            .map((pair) => pair.address);
+
+        filteredEvents = await this.elasticEventsService.getTokenTradingEvents(
+            tokenID,
+            pairsAddresses,
+            10,
+        );
 
-        while (filteredEvents.length < 10) {
-            const events =
-                await this.elasticEventsService.getTokenTradingEvents(
-                    tokenID,
-                    latestTimestamp,
-                    size,
-                );
-            filteredEvents.push(
-                ...events
-                    .filter((event) => pairsAddresses.includes(event.address))
-                    .reduce((unique, event) => {
-                        const eventId = createUniqueIdentifier(event);
-                        return unique.some(
-                            (e) => createUniqueIdentifier(e) === eventId,
-                        )
-                            ? unique
-                            : [...unique, event];
-                    }, [] as RawElasticEventType[])
-                    .slice(0, 10),
-            );
-            if (events.length < size) {
-                break;
-            }
-            latestTimestamp = filteredEvents[0].timestamp;
-        }
+        filteredEvents = filteredEvents.slice(0, 10);
 
         return filteredEvents.map((event) => {
             const eventConverted = convertEventTopicsAndDataToBase64(event);

diff --git a/src/modules/analytics/services/analytics.setter.service.ts b/src/modules/analytics/services/analytics.setter.service.ts
@@ -80,8 +80,8 @@ export class AnalyticsSetterService extends GenericSetterService {
         return await this.setData(
             this.getCacheKey('pairTradingActivity', pairAddress),
             value,
-            Constants.oneMinute() * 2,
-            Constants.oneMinute(),
+            Constants.oneMinute() * 5,
+            Constants.oneMinute() * 3,
         );
     }
 
@@ -92,8 +92,8 @@ export class AnalyticsSetterService extends GenericSetterService {
         return await this.setData(
             this.getCacheKey('tokenTradingActivity', tokenID),
             value,
-            Constants.oneMinute() * 2,
-            Constants.oneMinute(),
+            Constants.oneMinute() * 5,
+            Constants.oneMinute() * 3,
         );
     }
 

diff --git a/src/services/elastic-search/entities/terms.query.ts b/src/services/elastic-search/entities/terms.query.ts
@@ -0,0 +1,15 @@
+import { AbstractQuery } from '@multiversx/sdk-nestjs-elastic';
+
+export class CustomTermsQuery extends AbstractQuery {
+    constructor(private readonly key: string, private readonly values: any) {
+        super();
+    }
+
+    getQuery(): any {
+        return {
+            terms: {
+                [this.key]: this.values,
+            },
+        };
+    }
+}
diff --git a/src/services/elastic-search/services/es.events.service.ts b/src/services/elastic-search/services/es.events.service.ts
@@ -12,6 +12,7 @@ import { Logger } from 'winston';
 import { RawElasticEventType } from '../entities/raw.elastic.event';
 import { SwapEvent } from '@multiversx/sdk-exchange';
 import { convertEventTopicsAndDataToBase64 } from 'src/utils/elastic.search.utils';
+import { CustomTermsQuery } from '../entities/terms.query';
 
 @Injectable()
 export class ElasticSearchEventsService {
@@ -227,7 +228,7 @@ export class ElasticSearchEventsService {
 
     async getTokenTradingEvents(
         tokenID: string,
-        timestamp: number,
+        pairsAddresses: string[],
         size: number,
     ): Promise<RawElasticEventType[]> {
         const pagination = new ElasticPagination();
@@ -248,11 +249,12 @@ export class ElasticSearchEventsService {
                     SWAP_IDENTIFIER.SWAP_FIXED_OUTPUT,
                 ),
             ]),
-            QueryType.Range('timestamp', {
-                key: 'lte',
-                value: timestamp,
-            }),
         ];
+
+        elasticQueryAdapter.filter = [
+            new CustomTermsQuery('address', pairsAddresses),
+        ];
+
         elasticQueryAdapter.sort = [
             { name: 'timestamp', order: ElasticSortOrder.descending },
         ];