From ecd8b2474ac36f2371d1fb515cf1c3ae3bb44042 Mon Sep 17 00:00:00 2001
From: nikugogoi <nabarun@deepstacksoft.com>
Date: Thu, 10 Nov 2022 12:09:17 +0530
Subject: [PATCH] Remove eventName filter in events count query (#220)

---
 packages/graph-node/src/database.ts |  6 +++---
 packages/util/src/database.ts       | 29 ++++++++++-------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/packages/graph-node/src/database.ts b/packages/graph-node/src/database.ts
index a306e2f2..a3476ba0 100644
--- a/packages/graph-node/src/database.ts
+++ b/packages/graph-node/src/database.ts
@@ -544,7 +544,7 @@ export class Database {
     }
 
     let entities = await selectQueryBuilder.getRawMany();
-    entities = await this._transformResults(queryRunner, repo.createQueryBuilder('subTable'), entities);
+    entities = await this.transformResults(queryRunner, repo.createQueryBuilder('subTable'), entities);
 
     return entities as Entity[];
   }
@@ -670,7 +670,7 @@ export class Database {
     }
 
     let entities = await selectQueryBuilder.getRawMany();
-    entities = await this._transformResults(queryRunner, repo.createQueryBuilder('subTable'), entities);
+    entities = await this.transformResults(queryRunner, repo.createQueryBuilder('subTable'), entities);
 
     return entities as Entity[];
   }
@@ -1185,7 +1185,7 @@ export class Database {
     cachePrunedEntitiesCount.set(totalEntities);
   }
 
-  async _transformResults<Entity> (queryRunner: QueryRunner, qb: SelectQueryBuilder<Entity>, rawResults: any[]): Promise<any[]> {
+  async transformResults<Entity> (queryRunner: QueryRunner, qb: SelectQueryBuilder<Entity>, rawResults: any[]): Promise<any[]> {
     const transformer = new RawSqlResultsToEntityTransformer(
       qb.expressionMap,
       queryRunner.manager.connection.driver,
diff --git a/packages/util/src/database.ts b/packages/util/src/database.ts
index a96fd3de..e6352381 100644
--- a/packages/util/src/database.ts
+++ b/packages/util/src/database.ts
@@ -71,8 +71,6 @@ export class Database {
   _config: ConnectionOptions
   _conn!: Connection
   _pgPool: Pool
-  _blockCount = 0
-  _eventCount = 0
 
   constructor (config: ConnectionOptions) {
     assert(config);
@@ -181,8 +179,7 @@ export class Database {
   }
 
   async saveBlockProgress (repo: Repository<BlockProgressInterface>, block: DeepPartial<BlockProgressInterface>): Promise<BlockProgressInterface> {
-    this._blockCount++;
-    blockProgressCount.set(this._blockCount);
+    blockProgressCount.inc(1);
 
     return await repo.save(block);
   }
@@ -275,8 +272,7 @@ export class Database {
     });
 
     const blockProgress = await blockRepo.save(entity);
-    this._blockCount++;
-    blockProgressCount.set(this._blockCount);
+    blockProgressCount.inc(1);
 
     // Bulk insert events.
     events.forEach(event => {
@@ -301,8 +297,8 @@ export class Database {
     });
 
     await Promise.all(insertPromises);
-    this._eventCount += events.filter(event => event.eventName !== UNKNOWN_EVENT_NAME).length;
-    eventCount.set(this._eventCount);
+    const knownEvents = events.filter(event => event.eventName !== UNKNOWN_EVENT_NAME).length;
+    eventCount.inc(knownEvents);
   }
 
   async getEntities<Entity> (queryRunner: QueryRunner, entity: new () => Entity, findConditions?: FindManyOptions<Entity>): Promise<Entity[]> {
@@ -411,8 +407,7 @@ export class Database {
 
   async saveEventEntity (repo: Repository<EventInterface>, entity: EventInterface): Promise<EventInterface> {
     const event = await repo.save(entity);
-    this._eventCount++;
-    eventCount.set(this._eventCount);
+    eventCount.inc(1);
 
     return event;
   }
@@ -869,20 +864,16 @@ export class Database {
   }
 
   async _fetchBlockCount (): Promise<void> {
-    this._blockCount = await this._conn.getRepository('block_progress')
+    const res = await this._conn.getRepository('block_progress')
       .count();
 
-    blockProgressCount.set(this._blockCount);
+    blockProgressCount.set(res);
   }
 
   async _fetchEventCount (): Promise<void> {
-    this._eventCount = await this._conn.getRepository('event')
-      .count({
-        where: {
-          eventName: Not(UNKNOWN_EVENT_NAME)
-        }
-      });
+    const res = await this._conn.getRepository('event')
+      .count();
 
-    eventCount.set(this._eventCount);
+    eventCount.set(res);
   }
 }