fix: 🐛 Correct gql query to get transaction history for CA

PolymeshAssociation · Mar 4, 2024 · 4bc66fe · 4bc66fe
1 parent 65157d2
commit 4bc66fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/src/api/entities/confidential/ConfidentialAccount/index.ts b/src/api/entities/confidential/ConfidentialAccount/index.ts
@@ -356,9 +356,8 @@ export class ConfidentialAccount extends Entity<UniqueIdentifiers, string> {
     );
 
     const data: ConfidentialAssetHistoryEntry[] = nodes.map(
-      ({ id, assetId, amount, eventId, createdBlock, eventIdx }) => {
+      ({ assetId, amount, eventId, createdBlock, eventIdx }) => {
         return {
-          id,
           asset: new ConfidentialAsset({ id: assetId }, context),
           amount,
           eventId,

diff --git a/src/api/entities/confidential/ConfidentialAccount/types.ts b/src/api/entities/confidential/ConfidentialAccount/types.ts
@@ -30,7 +30,6 @@ export interface ApplyIncomingBalanceParams {
 }
 
 export type ConfidentialAssetHistoryEntry = {
-  id: string;
   asset: ConfidentialAsset;
   eventId: EventIdEnum;
   amount: string;

diff --git a/src/api/entities/confidential/__tests__/ConfidentialAccount/index.ts b/src/api/entities/confidential/__tests__/ConfidentialAccount/index.ts
@@ -334,7 +334,6 @@ describe('ConfidentialAccount class', () => {
     const eventIdx = new BigNumber(1);
     const fakeCreatedAt = { blockNumber, blockHash, blockDate, eventIndex: eventIdx };
     const mockData = {
-      id: 1,
       assetId: mockAsset.toHuman(),
       amount: '100000000000000000',
       eventId: EventIdEnum.AccountDeposit,
@@ -364,7 +363,6 @@ describe('ConfidentialAccount class', () => {
         data: [historyEntry],
       } = await account.getTransactionHistory({});
 
-      expect(historyEntry.id).toEqual(mockData.id);
       expect(historyEntry.asset).toBeInstanceOf(ConfidentialAsset);
       expect(historyEntry.amount).toEqual(mockData.amount);
       expect(historyEntry.amount).toEqual(mockData.amount);
@@ -395,7 +393,6 @@ describe('ConfidentialAccount class', () => {
         data: [historyEntry],
       } = await account.getTransactionHistory({ size, start });
 
-      expect(historyEntry.id).toEqual(mockData.id);
       expect(historyEntry.asset).toBeInstanceOf(ConfidentialAsset);
       expect(historyEntry.amount).toEqual(mockData.amount);
       expect(historyEntry.amount).toEqual(mockData.amount);

diff --git a/src/middleware/queries/confidential.ts b/src/middleware/queries/confidential.ts
@@ -31,7 +31,7 @@ export function confidentialAssetsByHolderQuery(
         offset: $start
       ) {
         nodes {
-          accountId,
+          accountId
           assetId
         }
         totalCount
@@ -52,7 +52,7 @@ export function createTransactionHistoryByConfidentialAssetQueryFilters(): {
   args: string;
   filter: string;
 } {
-  const args = ['$size: Int, $start: Int', '$assetId: [String!]'];
+  const args = ['$size: Int, $start: Int', '$assetId: String!'];
   const filters = ['assetId: { equalTo: $assetId }'];
 
   return {
@@ -73,7 +73,7 @@ export function transactionHistoryByConfidentialAssetQuery(
 ): QueryOptions<PaginatedQueryArgs<QueryArgs<ConfidentialAssetHistory, 'assetId'>>> {
   const { args, filter } = createTransactionHistoryByConfidentialAssetQueryFilters();
 
-  const query = gql`
+  const query = `
   query TransactionHistoryQuery
     ${args}
     {
@@ -83,27 +83,29 @@ export function transactionHistoryByConfidentialAssetQuery(
         offset: $start
       ){
         nodes {
-          accountId,
-          fromId,
-          toId,
-          transactionId,
-          assetId,
+          fromId
+          toId
+          transactionId
+          assetId
           createdBlock {
-            datetime,
-            hash,
-      	    blockId,
+            datetime
+            hash
+      	    blockId
           }
-          amount,
-          eventId,
-          memo,
+          amount
+          eventId
+          memo
         }
         totalCount
       }
     }
 `;
 
+  console.log(query);
   return {
-    query,
+    query: gql`
+      ${query}
+    `,
     variables: { size: size?.toNumber(), start: start?.toNumber(), assetId },
   };
 }