Handle GQL query fragment for single entity query

cerc-io · May 17, 2024 · d8a71bb · d8a71bb
1 parent b57aa76
commit d8a71bb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/util/src/graph/database.ts b/packages/util/src/graph/database.ts
@@ -241,15 +241,16 @@ 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);
     }
 
     // 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;