feat: add scores_total_value and vp_value_by_strategy to proposals GraphQL operation (#1025)

* feat: add scores_total_value and vp_value_by_strategy to proposals GraphQL operation

* fix: update orderBy logic to dynamically include valid fields

Author: bonustrack

src/graphql/helpers.ts

@@ -440,6 +440,7 @@ export function formatProposal(proposal) {
   proposal.plugins = jsonParse(proposal.plugins, {});
   proposal.scores = jsonParse(proposal.scores, []);
   proposal.scores_by_strategy = jsonParse(proposal.scores_by_strategy, []);
+  proposal.vp_value_by_strategy = jsonParse(proposal.vp_value_by_strategy, []);
   let proposalState = 'pending';
   const ts = parseInt((Date.now() / 1e3).toFixed());
   if (ts > proposal.start) proposalState = 'active';

src/graphql/operations/proposals.ts

@@ -21,7 +21,8 @@ export default async function (parent, args) {
     end: 'number',
     type: 'string',
     scores_state: 'string',
-    votes: 'number'
+    votes: 'number',
+    scores_total_value: 'number'
   };
   const whereQuery = buildWhereQuery(fields, 'p', where);
   let queryStr = whereQuery.query;
@@ -78,10 +79,13 @@ export default async function (parent, args) {
     params.push(JSON.stringify(where.labels_in));
   }
 
+  const orderByFields = Object.entries(fields)
+    .filter(field => field[1] === 'number')
+    .map(field => field[0]);
+
   let orderBy = args.orderBy || 'created';
   let orderDirection = args.orderDirection || 'desc';
-  if (!['created', 'start', 'end', 'votes'].includes(orderBy))
-    orderBy = 'created';
+  if (!orderByFields.includes(orderBy)) orderBy = 'created';
   orderBy = `p.${orderBy}`;
   orderDirection = orderDirection.toUpperCase();
   if (!['ASC', 'DESC'].includes(orderDirection)) orderDirection = 'DESC';

src/graphql/schema.gql

@@ -231,6 +231,12 @@ input ProposalWhere {
   votes_gte: Int,
   votes_lt: Int,
   votes_lte: Int,
+  scores_total_value: Float
+  scores_total_value_in: [Float]
+  scores_total_value_gt: Float
+  scores_total_value_gte: Float
+  scores_total_value_lt: Float
+  scores_total_value_lte: Float
 }
 
 input VoteWhere {
@@ -510,6 +516,8 @@ type Proposal {
   scores_state: String
   scores_total: Float
   scores_updated: Int
+  scores_total_value: Float
+  vp_value_by_strategy: Any
   votes: Int
   flagged: Boolean
   flagCode: Int