From d8a71bb63c2b133f0104dd90a30acb80294b2de6 Mon Sep 17 00:00:00 2001
From: Nabarun <nabarun@deepstacksoft.com>
Date: Fri, 17 May 2024 18:35:42 +0530
Subject: [PATCH] Handle GQL query fragment for single entity query

---
 packages/util/src/graph/database.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/util/src/graph/database.ts b/packages/util/src/graph/database.ts
index 94645d52..f69b850a 100644
--- a/packages/util/src/graph/database.ts
+++ b/packages/util/src/graph/database.ts
@@ -241,7 +241,7 @@ export class GraphDatabase {
       }
     };
 
-    let entityData: any = await repo.findOne(findOptions as FindOneOptions<Entity>);
+    let entityData = await repo.findOne(findOptions as FindOneOptions<Entity>);
 
     if (!entityData && findOptions.where.blockHash) {
       entityData = await this._baseDatabase.getPrevEntityVersion(queryRunner, repo, findOptions);
@@ -249,7 +249,8 @@ export class GraphDatabase {
 
     // Get relational fields
     if (entityData) {
-      entityData = await this.loadEntityRelations(queryRunner, block, relationsMap, entityType, entityData, selections, queryInfo);
+      const defragmentedSelections = this._defragmentGQLQuerySelections(selections, queryInfo);
+      entityData = await this.loadEntityRelations(queryRunner, block, relationsMap, entityType, entityData, defragmentedSelections, queryInfo);
     }
 
     return entityData;