Merge pull request #9 from cardanoapi/enhancement/proposal-API

Enhancement: Proposal API

Author: mesudip

src/controllers/proposal.ts

@@ -9,7 +9,13 @@ const router = Router()
 const getProposals = async (req: Request, res: Response) => {
     const size = req.query.size ? +req.query.size : 10
     const page = req.query.page ? +req.query.page : 1
-    const type = req.query.type ? (req.query.type as ProposalTypes) : undefined
+    const type = req.query.type
+        ? Array.isArray(req.query.type)
+            ? (req.query.type as ProposalTypes[])
+            : typeof req.query.type === 'string'
+                ? req.query.type.split(',').map((type) => type as ProposalTypes)
+                : undefined
+        : undefined
     const sort = req.query.sort ? (req.query.sort as SortTypes) : undefined
     const includeVoteCount = 'true' == (req.query.vote_count as string)
     let proposal = req.query.proposal as string
@@ -21,7 +27,7 @@ const getProposals = async (req: Request, res: Response) => {
         proposal = proposal.includes('#') ? proposal.split('#')[0] : proposal
     }
     const { items, totalCount } = await fetchProposals(page, size, proposal, type, sort, includeVoteCount)
-    return res.status(200).json({ totalCount: Math.round(totalCount / size), page, size, items })
+    return res.status(200).json({ totalCount: totalCount, page, size, items })
 }
 
 const getProposalVoteCount = async (req: Request, res: Response) => {

src/repository/proposal.ts

@@ -6,7 +6,7 @@ export const fetchProposals = async (
     page: number,
     size: number,
     proposal?: string,
-    proposalType?: ProposalTypes,
+    proposalType?: ProposalTypes[],
     sort?: SortTypes,
     includeVoteCount?: boolean
 ) => {
@@ -292,10 +292,13 @@ FROM
   AND gov_action_proposal.dropped_epoch IS NULL 
 ${
     proposalType
-        ? Prisma.sql`Where gov_action_proposal.type = ${Prisma.raw(`'${proposalType}'::govactiontype`)}`
+        ? Prisma.sql`WHERE gov_action_proposal.type = ANY(${Prisma.raw(
+              `ARRAY[${proposalType.map((type) => `'${type}'`).join(', ')}]::govactiontype[]`
+          )})`
         : Prisma.sql``
-} 
-GROUP BY
+}
+
+  GROUP BY
     (gov_action_proposal.id,
      stake_address.view,
      treasury_withdrawal.amount,

swagger.yaml

@@ -850,17 +850,19 @@ paths:
                 - in: query
                   name: type
                   schema:
-                      type: string
-                      enum:
-                          [
-                              ParameterChange,
-                              HardForkInitiation,
-                              TreasuryWithdrawals,
-                              NoConfidence,
-                              NewCommittee,
-                              NewConstitution,
-                              InfoAction,
-                          ]
+                   type: array
+                   items:
+                     type: string
+                     enum:
+                       - ParameterChange
+                       - HardForkInitiation
+                       - TreasuryWithdrawals
+                       - NoConfidence
+                       - NewCommittee
+                       - NewConstitution
+                       - InfoAction
+                  description: Filter by one or more action types.        
+                  explode: true       
                 - in: query
                   name: proposal
                   description: Search by proposal id