Competition indexing (#478)

* Fix #476 * Fix #470 * Bump version * Fix * Rename subbmisions -> suggestions * Rename * Rename
daostack · Feb 13, 2020 · e4b286d · e4b286d
1 parent 52669fd
commit e4b286d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@daostack/subgraph",
-  "version": "0.0.38-2",
+  "version": "0.0.38-3",
   "author": "DAOstack (https://www.daostack.io)",
   "license": "GPL-3.0",
   "description": "A caching layer for daostack using The Graph",

diff --git a/src/mappings/Competition/mapping.ts b/src/mappings/Competition/mapping.ts
@@ -27,8 +27,10 @@ export function handleNewCompetitionProposal(event: NewCompetitionProposal): voi
   competitionProposal.createdAt = event.block.timestamp;
   competitionProposal.suggestions = [];
   competitionProposal.winningSuggestions = [];
-  competitionProposal.totalSubmissions = BigInt.fromI32(0);
+  competitionProposal.totalSuggestions = BigInt.fromI32(0);
   competitionProposal.totalVotes = BigInt.fromI32(0);
+  competitionProposal.numberOfWinningSuggestions = BigInt.fromI32(0);
+  competitionProposal.admin = event.params._admin;
   competitionProposal.save();
   let proposal = Proposal.load(competitionProposal.id);
   if (proposal != null) {
@@ -81,7 +83,7 @@ export function handleNewSuggestion(event: NewSuggestion): void {
     let competitionSuggestions = competitionProposal.suggestions;
     competitionSuggestions.push(competitionSuggestion.id);
     competitionProposal.suggestions = competitionSuggestions;
-    competitionProposal.totalSubmissions = competitionProposal.totalSubmissions.plus(BigInt.fromI32(1));
+    competitionProposal.totalSuggestions = competitionProposal.totalSuggestions.plus(BigInt.fromI32(1));
     competitionProposal.save();
   }
 }
@@ -178,6 +180,7 @@ export function handleNewVote(event: NewVote): void {
     }
     competitionProposal.winningSuggestions = winningSuggestions;
     competitionProposal.totalVotes = competitionProposal.totalVotes.plus(BigInt.fromI32(1));
+    competitionProposal.numberOfWinningSuggestions = BigInt.fromI32(winningSuggestions.length);
     competitionProposal.save();
   }
 }

diff --git a/src/mappings/Competition/schema.graphql b/src/mappings/Competition/schema.graphql
@@ -16,8 +16,10 @@ type CompetitionProposal @entity {
     winningSuggestions: [CompetitionSuggestion!]
     votes: [CompetitionVote!] @derivedFrom(field: "proposal")
     createdAt: BigInt!
-    totalSubmissions: BigInt!
+    totalSuggestions: BigInt!
     totalVotes: BigInt!
+    numberOfWinningSuggestions: BigInt!
+    admin: Bytes!
 }
 
 type CompetitionSuggestion @entity {

diff --git a/test/0.0.1-rc.41/Competition.spec.ts b/test/0.0.1-rc.41/Competition.spec.ts
@@ -174,8 +174,10 @@ describe('Competition', () => {
               winningSuggestions {
                 suggestionId
               }
-              totalSubmissions
+              totalSuggestions
               totalVotes
+              numberOfWinningSuggestions
+              admin
             }
           }`);
 
@@ -203,8 +205,10 @@ describe('Competition', () => {
             votes: [],
             createdAt: timestampPropose.toString(),
             winningSuggestions: [],
-            totalSubmissions: '0',
+            totalSuggestions: '0',
             totalVotes: '0',
+            numberOfWinningSuggestions: '0',
+            admin: '0x0000000000000000000000000000000000000000',
         });
 
         // Pass the ContributionReward proposal to approve the competition
@@ -342,8 +346,9 @@ describe('Competition', () => {
                 winningSuggestions {
                     suggestionId
                 }
-                totalSubmissions
+                totalSuggestions
                 totalVotes
+                numberOfWinningSuggestions
             }
         }`;
 
@@ -353,8 +358,9 @@ describe('Competition', () => {
                 { suggestionId: suggestionId2.toString() },
             ],
             winningSuggestions: [],
-            totalSubmissions: '2',
+            totalSuggestions: '2',
             totalVotes: '0',
+            numberOfWinningSuggestions: '0',
         });
 
         // Get rep balance
@@ -456,15 +462,17 @@ describe('Competition', () => {
         let proposalVotesSnapshotBlockQuery = `{
             competitionProposal(id: "${proposalId}") {
                 snapshotBlock
-                totalSubmissions
+                totalSuggestions
                 totalVotes
+                numberOfWinningSuggestions
             }
         }`;
 
         expect((await sendQuery(proposalVotesSnapshotBlockQuery)).competitionProposal).toMatchObject({
             snapshotBlock: blockNumberVote1.toString(),
-            totalSubmissions: '2',
+            totalSuggestions: '2',
             totalVotes: '3',
+            numberOfWinningSuggestions: '2',
         });
 
         let proposalVotesWinningSuggestionsQuery = `{