From abba5a6f8f32f133ddef328d1053f2a1a28d8876 Mon Sep 17 00:00:00 2001
From: josemarinas <36479864+josemarinas@users.noreply.github.com>
Date: Tue, 30 Apr 2024 09:45:47 +0200
Subject: [PATCH] fix: adapt subgraph queries to new version of subgraph (#332)

* fix: addapt subgraph queries to new version of subgraph

* fix: tests
---
 modules/client/CHANGELOG.md                        |  5 +++++
 modules/client/package.json                        |  2 +-
 .../multisig/internal/graphql-queries/proposal.ts  | 14 +++++++++-----
 modules/client/src/multisig/internal/types.ts      |  6 ++----
 modules/client/src/multisig/internal/utils.ts      |  4 ++--
 .../integration/multisig-client/methods.test.ts    |  6 +++---
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/modules/client/CHANGELOG.md b/modules/client/CHANGELOG.md
index 5de4451c5..c4a68e589 100644
--- a/modules/client/CHANGELOG.md
+++ b/modules/client/CHANGELOG.md
@@ -18,6 +18,11 @@ TEMPLATE:
 -->
 
 ## [UPCOMING]
+## [1.23.2]
+
+### Changed
+- Update subgraph queries to version 1.4.2 of subgraph
+
 ## [1.23.1]
 
 ### Fixed
diff --git a/modules/client/package.json b/modules/client/package.json
index 6618b6047..c73f00d25 100644
--- a/modules/client/package.json
+++ b/modules/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aragon/sdk-client",
   "author": "Aragon Association",
-  "version": "1.23.1",
+  "version": "1.23.2",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/sdk-client.esm.js",
diff --git a/modules/client/src/multisig/internal/graphql-queries/proposal.ts b/modules/client/src/multisig/internal/graphql-queries/proposal.ts
index b7ddd2631..a23a99434 100644
--- a/modules/client/src/multisig/internal/graphql-queries/proposal.ts
+++ b/modules/client/src/multisig/internal/graphql-queries/proposal.ts
@@ -29,8 +29,10 @@ query MultisigProposal($proposalId: ID!) {
     executed
     approvalReached
     isSignaling
-    approvers(first: 1000){
-      id
+    approvals(first: 1000){
+      approver{
+        address
+      }
     }
   }
 }
@@ -48,14 +50,16 @@ query MultisigProposals($where: MultisigProposal_filter!, $limit:Int!, $skip: In
     executed
     approvalReached
     isSignaling
-    approvals
+    approvalCount
     startDate
     endDate
     executionDate
     executionBlockNumber
     creationBlockNumber
-    approvers {
-      id
+    approvals(first: 1000){
+      approver{
+        address
+      }
     }
     actions {
       to
diff --git a/modules/client/src/multisig/internal/types.ts b/modules/client/src/multisig/internal/types.ts
index b296127ef..e7ab21408 100644
--- a/modules/client/src/multisig/internal/types.ts
+++ b/modules/client/src/multisig/internal/types.ts
@@ -4,9 +4,7 @@ export type SubgraphMultisigProposalBase = SubgraphProposalBase & {
   plugin: SubgraphMultisigVotingSettings;
   minApprovals: number;
   approvalReached: boolean;
-  approvers: { id: string, approver: { address: string} }[];
-  // TODO change on subgraph fix
-  // approvers: SubgraphMultisigApproversListItem[];
+  approvals: SubgraphMultisigApproversListItem[];
 };
 
 export type SubgraphMultisigProposalListItem = SubgraphMultisigProposalBase;
@@ -20,7 +18,7 @@ export type SubgraphMultisigProposal = SubgraphMultisigProposalBase & {
 };
 
 export type SubgraphMultisigApproversListItem = {
-  approver: { id: string };
+  approver: { address: string };
 };
 
 export type SubgraphMultisigVotingSettings = {
diff --git a/modules/client/src/multisig/internal/utils.ts b/modules/client/src/multisig/internal/utils.ts
index 9fc57483f..8cb96c0cb 100644
--- a/modules/client/src/multisig/internal/utils.ts
+++ b/modules/client/src/multisig/internal/utils.ts
@@ -66,7 +66,7 @@ export function toMultisigProposal(
       },
     ),
     status: computeProposalStatus(proposal),
-    approvals: proposal.approvers.map(
+    approvals: proposal.approvals.map(
       (a) => a.approver.address,
     ),
   };
@@ -92,7 +92,7 @@ export function toMultisigProposalListItem(
       title: metadata.title,
       summary: metadata.summary,
     },
-    approvals: proposal.approvers.map(
+    approvals: proposal.approvals.map(
       (a) => a.approver.address,
     ),
     actions: proposal.actions.map(
diff --git a/modules/client/test/integration/multisig-client/methods.test.ts b/modules/client/test/integration/multisig-client/methods.test.ts
index 534eb878b..730c56836 100644
--- a/modules/client/test/integration/multisig-client/methods.test.ts
+++ b/modules/client/test/integration/multisig-client/methods.test.ts
@@ -613,7 +613,7 @@ describe("Client Multisig", () => {
         executionDate: Math.round(Date.now() / 1000).toString(),
         executionBlockNumber: "50",
         executionTxHash: TEST_TX_HASH,
-        approvers: [{ id: `${ADDRESS_ONE}_${ADDRESS_ONE}`, approver: {address: ADDRESS_ONE} }, { id: `${ADDRESS_TWO}_${ADDRESS_ONE}`, approver: {address: ADDRESS_TWO}}],
+        approvals: [{ approver: {address: ADDRESS_ONE} }, { approver: {address: ADDRESS_TWO}}],
         minApprovals: 5,
         plugin: {
           onlyListed: true,
@@ -675,7 +675,7 @@ describe("Client Multisig", () => {
         parseInt(subgraphProposal.executionBlockNumber),
       );
       expect(proposal.approvals).toMatchObject(
-        subgraphProposal.approvers.map((approver) => approver.approver.address),
+        subgraphProposal.approvals.map((approver) => approver.approver.address),
       );
       expect(proposal.settings.minApprovals).toBe(
         subgraphProposal.plugin.minApprovals,
@@ -737,7 +737,7 @@ describe("Client Multisig", () => {
       mockedClient.request.mockResolvedValueOnce({
         multisigProposals: [{
           ...SUBGRAPH_PROPOSAL_BASE,
-          approvers: [{ id: `${ADDRESS_ONE}_${ADDRESS_ONE}`, approver: { address: ADDRESS_ONE } }, { id: `${ADDRESS_TWO}_${ADDRESS_ONE}`, approver: { address: ADDRESS_TWO } }],
+          approvals: [{ approver: { address: ADDRESS_ONE } }, { approver: { address: ADDRESS_TWO } }],
           plugin: {
             onlyListed: true,
           },