Merge pull request #7 from cardanoapi/fix/cc-vote-count

Fix/cc vote count

Author: mesudip

src/repository/drep.ts

@@ -573,7 +573,7 @@ export const fetchDrepLiveStats = async (drepId: string, isScript?: boolean) =>
 
     const drepVotingHistory = (await prisma.$queryRaw`
         WITH firstRegistration AS (
-            SELECT b.time AS firstRegistrationTime
+            SELECT b.epoch_no AS firstRegistrationEpoch
             FROM drep_registration dr
             JOIN drep_hash dh ON dh.id = dr.drep_hash_id
             JOIN tx ON tx.id = dr.tx_id
@@ -586,10 +586,8 @@ export const fetchDrepLiveStats = async (drepId: string, isScript?: boolean) =>
         govActionsAfter AS (
             SELECT COALESCE(COUNT(DISTINCT gp.id), 0) AS totalGovActionsAfter
             FROM gov_action_proposal AS gp
-            JOIN tx ON tx.id = gp.tx_id
-            JOIN block b ON b.id = tx.block_id
             LEFT JOIN firstRegistration ON TRUE 
-            WHERE b.time > firstRegistration.firstRegistrationTime
+            WHERE gp.expiration > firstRegistration.firstRegistrationEpoch
         ),
         votedGovActions AS (
             SELECT COUNT(DISTINCT gp.id) AS voted
@@ -959,4 +957,4 @@ export const fetchDrepDelegationHistory = async (dRepId: string, isScript?: bool
     })
     flattenedDelegations.sort((a: Delegation, b: Delegation) => new Date(b.time).getTime() - new Date(a.time).getTime())
     return flattenedDelegations
-}
+}

src/repository/proposal.ts

@@ -1,6 +1,5 @@
 import { Prisma } from '@prisma/client'
 import { prisma } from '../config/db'
-import { formatResult } from '../helpers/formatter'
 import { ProposalTypes, SortTypes } from '../types/proposal'
 
 export const fetchProposals = async (
@@ -503,7 +502,24 @@ export const fetchProposalVoteCount = async (proposalId: string, proposalIndex:
     `
     const spoSelectionQuery = Prisma.sql`SELECT 'spo' AS voterRole, (SELECT jsonb_agg(to_jsonb(poolVoteRecord)) FROM poolVoteRecord) AS voteRecord`
     const ccVoteQuery = Prisma.sql`
-        , committeeVoteRecord AS (
+        , RatifiedCommitteeGovAction AS (
+            SELECT gap.id
+            FROM gov_action_proposal gap
+            WHERE gap.type = 'NewCommittee'
+            AND ratified_epoch IS NOT NULL
+            ORDER BY gap.id DESC
+            LIMIT 1
+        ),
+        Committee AS (
+            SELECT Count(DISTINCT(ch.raw)) as committeeMembersCount
+            FROM committee c
+            JOIN committee_member cm ON cm.committee_id = c.id
+            JOIN committee_hash ch ON cm.committee_hash_id = ch.id
+            LEFT JOIN RatifiedCommitteeGovAction rc 
+                ON rc.id = c.gov_action_proposal_id
+            WHERE c.gov_action_proposal_id IS NULL
+        ), 
+        committeeVoteRecord AS (
             WITH CommitteeVotes AS (
                 -- Count committee votes for each vote type
                 SELECT 
@@ -531,8 +547,8 @@ export const fetchProposalVoteCount = async (proposalId: string, proposalIndex:
                 WHERE cm.expiration_epoch > (SELECT epoch FROM latestOrGovActionExpiration)
                 ORDER BY ch.raw, cm.expiration_epoch DESC
             )
-            SELECT 'total_distribution' as vote_type, COUNT(DISTINCT hash) AS count
-            FROM CommitteeData
+            SELECT 'total_distribution' as vote_type, committeeMembersCount AS count
+            FROM Committee
             UNION ALL
             SELECT 'yes_votes' as vote_type, COALESCE(cc_Yes_Votes, 0) AS count FROM CommitteeVotes
             UNION ALL
@@ -1308,6 +1324,7 @@ export const fetchProposalById = async (proposalId: string, proposaIndex: number
         any,
         any
     >[]
+    if (result.length == 0) return result
     const proposalVoteCount = includeVoteCount
         ? { vote: await fetchProposalVoteCount(proposalId, proposaIndex) }
         : undefined