Skip to content

Commit 0153562

Browse files
authored
Merge pull request #2269 from IntersectMBO/develop
fix: handle no results on get votes query
2 parents de6dec2 + 6f7e5fc commit 0153562

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

govtool/backend/src/VVA/DRep.hs

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,23 @@ getVotes ::
107107
m ([Vote], [Proposal])
108108
getVotes drepId selectedProposals = withPool $ \conn -> do
109109
results <- liftIO $ SQL.query conn getVotesSql (SQL.Only drepId)
110-
let proposalsToSelect = if null selectedProposals
111-
then [ govActionId | (_, govActionId, _, _, _, _, _, _, _) <- results]
112-
else selectedProposals
113-
proposals <- Proposal.getProposals (Just proposalsToSelect)
114-
let proposalMap = M.fromList $ map (\x -> (proposalId x, x)) proposals
115-
timeZone <- liftIO getCurrentTimeZone
116-
return
117-
([ Vote proposalId' drepId' vote' url' docHash' epochNo' (localTimeToUTC timeZone date') voteTxHash'
118-
| (proposalId', govActionId', drepId', vote', url', docHash', epochNo', date', voteTxHash') <- results
119-
, govActionId' `elem` proposalsToSelect
120-
], proposals)
110+
111+
if null results
112+
then return ([], [])
113+
else do
114+
let proposalsToSelect = if null selectedProposals
115+
then [ govActionId | (_, govActionId, _, _, _, _, _, _, _) <- results]
116+
else selectedProposals
117+
proposals <- if null proposalsToSelect
118+
then return []
119+
else Proposal.getProposals (Just proposalsToSelect)
120+
let proposalMap = M.fromList $ map (\x -> (proposalId x, x)) proposals
121+
timeZone <- liftIO getCurrentTimeZone
122+
let votes = [ Vote proposalId' drepId' vote' url' docHash' epochNo' (localTimeToUTC timeZone date') voteTxHash'
123+
| (proposalId', govActionId', drepId', vote', url', docHash', epochNo', date', voteTxHash') <- results
124+
, govActionId' `elem` proposalsToSelect
125+
]
126+
return (votes, proposals)
121127

122128
getDRepInfoSql :: SQL.Query
123129
getDRepInfoSql = sqlFrom $(embedFile "sql/get-drep-info.sql")

0 commit comments

Comments
 (0)