Fix past councils working groups data (#4553)

* Fix-3225: used BudgetUpdatedEvent instead of BudgetSetEvent

* Fix 3225 : updated test.tsx and mock server.ts

* Fix 3225: updated newMissedRewardLevelReachedEvent's block range and removed budgetSetEvent

* Fix 3225: fix lint issue

packages/ui/src/council/hooks/usePastCouncilWorkingGroups.ts

@@ -24,7 +24,11 @@ export const usePastCouncilWorkingGroups = (id: string) => {
     workingGroups:
       data &&
       data.workingGroups.map(
-        asPastCouncilWorkingGroup(data.budgetSetEvents, data.rewardPaidEvents, data.newMissedRewardLevelReachedEvents)
+        asPastCouncilWorkingGroup(
+          data.rewardPaidEvents,
+          data.newMissedRewardLevelReachedEvents,
+          data.budgetUpdatedEvents
+        )
       ),
   }
 }

packages/ui/src/council/queries/council.graphql

@@ -21,6 +21,7 @@ fragment PastCouncilProposalsFields on ProposalVotedEvent {
 fragment PastCouncilWorkingGroupFields on WorkingGroup {
   id
   name
+  budget
 }
 
 fragment PastCouncilBudgetSetEventFields on BudgetSetEvent {
@@ -39,6 +40,11 @@ fragment PastCouncilNewMissedRewardLevelReachedEventFields on NewMissedRewardLev
   newMissedRewardAmount
 }
 
+fragment PastCouncilBudgetUpdatedEventFields on BudgetUpdatedEvent {
+  groupId
+  budgetChangeAmount
+}
+
 fragment ElectedCouncilFields on ElectedCouncil {
   id
   electedAtBlock
@@ -243,15 +249,15 @@ query GetPastCouncilWorkingGroups($fromBlock: Int!, $toBlock: Int!) {
   workingGroups {
     ...PastCouncilWorkingGroupFields
   }
-  budgetSetEvents(where: { inBlock_lte: $toBlock }, orderBy: [inBlock_DESC]) {
-    ...PastCouncilBudgetSetEventFields
-  }
   rewardPaidEvents(where: { inBlock_gte: $fromBlock, inBlock_lte: $toBlock }) {
     ...PastCouncilRewardPaidEventFields
   }
-  newMissedRewardLevelReachedEvents(where: { inBlock_lte: $toBlock }, orderBy: [inBlock_DESC]) {
+  newMissedRewardLevelReachedEvents(where: { inBlock_gte: $fromBlock, inBlock_lte: $toBlock }) {
     ...PastCouncilNewMissedRewardLevelReachedEventFields
   }
+  budgetUpdatedEvents(where: { inBlock_gte: $fromBlock, inBlock_lte: $toBlock }) {
+    ...PastCouncilBudgetUpdatedEventFields
+  }
 }
 
 query GetCurrentElection {

packages/ui/src/council/types/PastCouncilWorkingGroup.ts

@@ -3,7 +3,7 @@ import BN from 'bn.js'
 import { BN_ZERO } from '@/common/constants'
 import { arrayGroupBy } from '@/common/utils'
 import {
-  PastCouncilBudgetSetEventFieldsFragment,
+  PastCouncilBudgetUpdatedEventFieldsFragment,
   PastCouncilNewMissedRewardLevelReachedEventFieldsFragment,
   PastCouncilRewardPaidEventFieldsFragment,
   PastCouncilWorkingGroupFieldsFragment,
@@ -34,9 +34,9 @@ const getTotalMissedReward = (
 
 export const asPastCouncilWorkingGroup =
   (
-    budgetSetEvents: PastCouncilBudgetSetEventFieldsFragment[],
     rewardPaidEvents: PastCouncilRewardPaidEventFieldsFragment[],
-    newMissedRewardLevelReachedEvents: PastCouncilNewMissedRewardLevelReachedEventFieldsFragment[]
+    newMissedRewardLevelReachedEvents: PastCouncilNewMissedRewardLevelReachedEventFieldsFragment[],
+    budgetUpdatedEvents: PastCouncilBudgetUpdatedEventFieldsFragment[]
   ) =>
   (fields: PastCouncilWorkingGroupFieldsFragment): PastCouncilWorkingGroup => ({
     id: fields.id,
@@ -45,5 +45,7 @@ export const asPastCouncilWorkingGroup =
       .filter((rewardEvent) => rewardEvent.groupId === fields.id)
       .reduce((a, b) => a.add(new BN(b.amount)), BN_ZERO),
     totalMissedReward: getTotalMissedReward(newMissedRewardLevelReachedEvents, fields.id),
-    budget: new BN(budgetSetEvents.find((budgetEvent) => budgetEvent.groupId === fields.id)?.newBudget ?? 0),
+    budget: budgetUpdatedEvents
+      .filter((updatedEvent) => updatedEvent.groupId === fields.id)
+      .reduce((a, b) => a.add(new BN(b.budgetChangeAmount)), BN_ZERO),
   })

packages/ui/src/mocks/server.ts

@@ -110,6 +110,7 @@ export const makeServer = (environment = 'development', endpoints = DEFAULT_NETW
               workSubmittedEvents: getWhereResolver('WorkSubmittedEvent'),
               workSubmittedEventsConnection: getConnectionResolver('WorkSubmittedEventConnection'),
               budgetSetEvents: getWhereResolver('BudgetSetEvent'),
+              budgetUpdatedEvents: getWhereResolver('BudgetUpdatedEvent'),
               budgetSpendingEvents: getWhereResolver('BudgetSpendingEvent'),
               candidates: getWhereResolver('Candidate'),
               candidatesConnection: getConnectionResolver('CandidateConnection'),

packages/ui/test/council/pages/PastCouncil.test.tsx

@@ -350,13 +350,14 @@ describe('UI: Past Council page', () => {
           )
           seedEvent(
             {
+              id: '1',
               inBlock: 1,
               createdAt: '2021-09-14T11:54:56.127Z',
               network: 'OLYMPIA',
               groupId: WORKER_DATA.groupId,
-              newBudget: 80000,
+              budgetChangeAmount: 80000,
             },
-            'BudgetSetEvent',
+            'BudgetUpdatedEvent',
             mockServer.server
           )
           seedEvent(