From 3e820a6348603fbfe9975afaf99d3063f855e50e Mon Sep 17 00:00:00 2001 From: Adam Tomaszczyk Date: Fri, 19 Sep 2025 12:04:01 +0200 Subject: [PATCH] Fix SQL counting the number of active CC members - additional fix for preview --- govtool/backend/sql/get-network-metrics.sql | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/govtool/backend/sql/get-network-metrics.sql b/govtool/backend/sql/get-network-metrics.sql index b3f3764a2..651f28a6d 100644 --- a/govtool/backend/sql/get-network-metrics.sql +++ b/govtool/backend/sql/get-network-metrics.sql @@ -22,13 +22,18 @@ CurrentEpoch AS ( SELECT MAX(no) AS no FROM epoch ), CommitteeMembers AS ( - SELECT DISTINCT ON (cm.committee_hash_id) - cm.id, - cm.expiration_epoch + SELECT + DISTINCT cm.committee_hash_id AS committee_members FROM committee_member cm - CROSS JOIN CurrentEpoch - WHERE - cm.expiration_epoch >= CurrentEpoch.no + JOIN committee c ON c.id = cm.committee_id + LEFT JOIN gov_action_proposal gap ON gap.id = c.gov_action_proposal_id + CROSS JOIN CurrentEpoch ce + WHERE ( + (c.gov_action_proposal_id IS NULL) + OR + (gap.enacted_epoch IS NOT NULL AND gap.enacted_epoch <= ce.no) + ) + AND cm.expiration_epoch >= ce.no ), NoOfCommitteeMembers AS ( SELECT COUNT(*) total FROM CommitteeMembers