From cb8122eb672a6232e8a60b9dec069b128f90ff8f Mon Sep 17 00:00:00 2001 From: Wan Qi Chen <495709+wa0x6e@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:48:11 +0900 Subject: [PATCH] fix: get strategies data from DB directly --- src/graphql/operations/strategy.ts | 6 +++--- src/helpers/strategies.ts | 34 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/graphql/operations/strategy.ts b/src/graphql/operations/strategy.ts index 80833609..166dfad0 100644 --- a/src/graphql/operations/strategy.ts +++ b/src/graphql/operations/strategy.ts @@ -1,5 +1,5 @@ -import { strategiesObj } from '../../helpers/strategies'; +import { strategies } from '../../helpers/strategies'; -export default async function (parent, { id }) { - return strategiesObj[id]; +export default function (parent, { id }) { + return strategies.find(strategy => strategy.id === id); } diff --git a/src/helpers/strategies.ts b/src/helpers/strategies.ts index 8ac3a729..2e76d702 100644 --- a/src/helpers/strategies.ts +++ b/src/helpers/strategies.ts @@ -1,11 +1,10 @@ import snapshot from '@snapshot-labs/snapshot.js'; -import { spaces } from './spaces'; -import log from './log'; import { capture } from '@snapshot-labs/snapshot-sentry'; import { URL } from 'url'; +import db from '../helpers/mysql'; +import log from './log'; export let strategies: any[] = []; -export let strategiesObj: any = {}; const scoreApiURL: URL = new URL(process.env.SCORE_API_URL ?? 'https://score.snapshot.org'); scoreApiURL.pathname = '/api/strategies'; @@ -21,24 +20,31 @@ async function loadStrategies() { return true; } - Object.values(spaces).forEach((space: any) => { - const ids = new Set(space.strategies.map(strategy => strategy.name)); - ids.forEach(id => { - if (res[id]) { - res[id].spacesCount = (res[id].spacesCount || 0) + 1; - } - }); - }); + const results = new Map( + ( + await db.queryAsync(` + SELECT + s.name as id, + COUNT(s.name) as count + FROM + spaces, + JSON_TABLE( + spaces.settings, + '$.strategies[*]' COLUMNS (name VARCHAR(40) PATH '$.name') + ) s + GROUP BY s.name + ORDER BY count DESC; + `) + ).map(r => [r.id, r.count]) + ); strategies = Object.values(res) .map((strategy: any) => { strategy.id = strategy.key; - strategy.spacesCount = strategy.spacesCount || 0; + strategy.spacesCount = results.get(strategy.id) || 0; return strategy; }) .sort((a, b): any => b.spacesCount - a.spacesCount); - - strategiesObj = Object.fromEntries(strategies.map(strategy => [strategy.id, strategy])); } async function run() {