[fix] authors case formatting for gov actions

Author: Ciabas

govtool/backend/sql/list-proposals.sql

@@ -304,12 +304,13 @@ SELECT
     COALESCE(cv.ccAbstainVotes, 0) cc_abstain_votes,
     prev_gov_action.index as prev_gov_action_index,
     encode(prev_gov_action_tx.hash, 'hex') as prev_gov_action_tx_hash,
+    off_chain_vote_data.body,
     COALESCE(
       json_agg(
         json_build_object(
           'name', off_chain_vote_author.name,
-          'witness_algorithm', off_chain_vote_author.witness_algorithm,
-          'public_key', off_chain_vote_author.public_key,
+          'witnessAlgorithm', off_chain_vote_author.witness_algorithm,
+          'publicKey', off_chain_vote_author.public_key,
           'signature', off_chain_vote_author.signature
         )
       ) FILTER (WHERE off_chain_vote_author.id IS NOT NULL),
@@ -367,4 +368,5 @@ GROUP BY
     off_chain_vote_gov_action_data.title,
     off_chain_vote_gov_action_data.abstract,
     off_chain_vote_gov_action_data.motivation,
-    off_chain_vote_gov_action_data.rationale;
+    off_chain_vote_gov_action_data.rationale,
+    off_chain_vote_data.body;

govtool/backend/src/VVA/API.hs

@@ -245,6 +245,7 @@ proposalToResponse timeZone Types.Proposal {..} =
     proposalResponseCcAbstainVotes = proposalCcAbstainVotes,
     proposalResponsePrevGovActionIndex = proposalPrevGovActionIndex,
     proposalResponsePrevGovActionTxHash = HexText <$> proposalPrevGovActionTxHash,
+    proposalResponseBody = proposalBody,
     proposalResponseAuthors = ProposalAuthors <$> proposalAuthors
   }
 

govtool/backend/src/VVA/API/Types.hs

@@ -401,6 +401,7 @@ data ProposalResponse
       , proposalResponseCcAbstainVotes      :: Integer
       , proposalResponsePrevGovActionIndex  :: Maybe Integer
       , proposalResponsePrevGovActionTxHash :: Maybe HexText
+      , proposalResponseBody                :: Maybe Value
       , proposalResponseAuthors             :: Maybe ProposalAuthors
       }
   deriving (Generic, Show)
@@ -422,18 +423,31 @@ instance ToSchema ProposalAuthors where
     & example ?~ toJSON
         [ object
             [ "name" .= ("Alice" :: Text)
-            , "witness_algorithm" .= ("algo" :: Text)
-            , "public_key" .= ("key" :: Text)
+            , "witnessAlgorithm" .= ("algo" :: Text)
+            , "publicKey" .= ("key" :: Text)
             , "signature" .= ("sig" :: Text)
             ]
         , object
             [ "name" .= ("Bob" :: Text)
-            , "witness_algorithm" .= ("algo2" :: Text)
-            , "public_key" .= ("key2" :: Text)
+            , "witnessAlgorithm" .= ("algo2" :: Text)
+            , "publicKey" .= ("key2" :: Text)
             , "signature" .= ("sig2" :: Text)
             ]
         ]
 
+exampleProposalAuthors :: Text
+exampleProposalAuthors =
+  "[\
+  \ {\"name\": \"Alice\",\
+  \  \"witnessAlgorithm\": \"Ed25519\",\
+  \  \"publicKey\": \"abcdef123456\",\
+  \  \"signature\": \"deadbeef\"},\
+  \ {\"name\": \"Bob\",\
+  \  \"witnessAlgorithm\": \"Ed25519\",\
+  \  \"publicKey\": \"123456abcdef\",\
+  \  \"signature\": \"beefdead\"}\
+  \]"
+
 deriveJSON (jsonOptions "proposalResponse") ''ProposalResponse
 
 exampleProposalResponse :: Text
@@ -463,7 +477,9 @@ exampleProposalResponse = "{ \"id\": \"proposalId123\","
                   <> "\"cCNoVotes\": 0,"
                   <> "\"cCAbstainVotes\": 0,"
                   <> "\"prevGovActionIndex\": 0,"
-                  <> "\"prevGovActionTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\"}"
+                  <> "\"prevGovActionTxHash\": \"47c14a128cd024f1b990c839d67720825921ad87ed875def42641ddd2169b39c\","
+                  <> "\"authors\": " <> exampleProposalAuthors
+                  <> "}"
 
 instance ToSchema Value where
   declareNamedSchema _ = pure $ NamedSchema (Just "Value") $ mempty

govtool/backend/src/VVA/Types.hs

@@ -208,6 +208,7 @@ data Proposal
       , proposalCcAbstainVotes        :: Integer
       , proposalPrevGovActionIndex    :: Maybe Integer
       , proposalPrevGovActionTxHash   :: Maybe Text
+      , proposalBody                  :: Maybe Value
       , proposalAuthors               :: Maybe Value
       }
   deriving (Show)
@@ -242,6 +243,7 @@ instance FromRow Proposal where
       <*> (floor @Scientific <$> field) -- proposalCcAbstainVotes
       <*> field -- prevGovActionIndex
       <*> field -- prevGovActionTxHash
+      <*> field -- proposalBody
       <*> field -- proposalAuthors
 
 data TransactionStatus = TransactionStatus