Merge pull request #1108 from multiversx/MEX-329

MEX-329: fix and add filters

src/config/devnet.json

@@ -51,7 +51,7 @@
         "escrow": "erd1qqqqqqqqqqqqqpgqz0wkk0j6y4h0mcxfxsg023j4x5sfgrmz0n4s4swp7a",
         "governance": {
             "energy": [
-                "erd1qqqqqqqqqqqqqpgqu5u5kgmjm067dhwdfe4l3flwmadm2nqlczfskufug3"
+                "erd1qqqqqqqqqqqqqpgqmufzvsm3mncnpsawj0ypyzj2d9xl9xkvczfsmkxn5y"
             ],
             "token": []
         }

src/modules/governance/governance.energy.contract.resolver.ts

@@ -1,4 +1,4 @@
-import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
+import { Args, Int, Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { GovernanceAbiService } from './services/governance.abi.service';
 import { GovernanceEnergyContract } from './models/energy.contract.model';
 import { GovernanceProposal } from './models/governance.proposal.model';
@@ -49,8 +49,17 @@ export class GovernanceEnergyContractResolver {
     }
 
     @ResolveField(() => [GovernanceProposal])
-    async proposals(@Parent() energyContract: GovernanceEnergyContract): Promise<GovernanceProposal[]> {
-        return this.governanceAbi.proposals(energyContract.address);
+    async proposals(
+        @Parent() energyContract: GovernanceEnergyContract,
+        @Args('proposalId', {type: ()=> Int, nullable: true}) proposalId?: number
+    ): Promise<GovernanceProposal[]> {
+        const proposals = await this.governanceAbi.proposals(energyContract.address);
+
+        if(proposalId) {
+            return proposals.filter(proposal => proposal.proposalId === proposalId);
+        } else {
+            return proposals;
+        }
     }
 
     @ResolveField()

src/modules/governance/models/governance.proposal.model.ts

@@ -31,6 +31,8 @@ export class Description {
     hash: string;
     @Field(() => Int)
     strapiId: number;
+    @Field(() => Int)
+    version: number;
 
     constructor(init: Partial<Description>) {
         Object.assign(this, init);

src/modules/governance/services/governance.service.ts

@@ -18,7 +18,7 @@ export class GovernanceService {
         let governanceAddresses = governanceContractsAddresses();
 
         if (filters.contracts) {
-            governanceAddresses = governanceAddresses.filter((address) => !filters.contracts.includes(address));
+            governanceAddresses = governanceAddresses.filter((address) => filters.contracts.includes(address));
         }
 
         const governance: GovernanceEnergyContract[] = [];