Rename proposal_extra_fields to extra

input-output-hk · Dec 2, 2022 · e12c5e5 · e12c5e5
1 parent 279a85c
commit e12c5e5
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 21 deletions.
diff --git a/src/vit-servicing-station/vit-servicing-station-cli/src/csv/models.rs b/src/vit-servicing-station/vit-servicing-station-cli/src/csv/models.rs
@@ -333,7 +333,7 @@ pub struct Proposal {
     #[serde(alias = "proposalMetrics", default)]
     proposal_metrics: Option<String>,
     #[serde(alias = "proposalExtraFields", default)]
-    proposal_extra_fields: Option<BTreeMap<String, String>>,
+    extra: Option<BTreeMap<String, String>>,
 }
 
 fn default_fund_id() -> i32 {
@@ -418,7 +418,7 @@ impl Proposal {
             chain_vote_encryption_key: self.chain_vote_encryption_key,
             fund_id: self.fund_id,
             challenge_id: self.challenge_id,
-            proposal_extra_fields: self.proposal_extra_fields,
+            extra: self.extra,
         };
 
         let challenge_info = match challenge_type {

diff --git a/...ing-station-lib/migrations/postgres/2022-11-29-134506_add_proposals_extra_fields/down.sql b/...ing-station-lib/migrations/postgres/2022-11-29-134506_add_proposals_extra_fields/down.sql
@@ -1 +1 @@
-ALTER TABLE proposals DROP extra_fields;
+ALTER TABLE proposals DROP extra;
diff --git a/...icing-station-lib/migrations/postgres/2022-11-29-134506_add_proposals_extra_fields/up.sql b/...icing-station-lib/migrations/postgres/2022-11-29-134506_add_proposals_extra_fields/up.sql
@@ -1,4 +1,4 @@
-ALTER TABLE proposals ADD proposal_extra_fields TEXT;
+ALTER TABLE proposals ADD extra TEXT;
 
 -- Recreate view so it's updated with the added field
 DROP VIEW full_proposals_info;

diff --git a/...icing-station-lib/migrations/sqlite/2022-11-29-134506_add_proposals_extra_fields/down.sql b/...icing-station-lib/migrations/sqlite/2022-11-29-134506_add_proposals_extra_fields/down.sql
@@ -1 +1 @@
-ALTER TABLE proposals DROP extra_fields;
+ALTER TABLE proposals DROP extra;
diff --git a/...rvicing-station-lib/migrations/sqlite/2022-11-29-134506_add_proposals_extra_fields/up.sql b/...rvicing-station-lib/migrations/sqlite/2022-11-29-134506_add_proposals_extra_fields/up.sql
@@ -1 +1 @@
-ALTER TABLE proposals ADD proposal_extra_fields TEXT;
+ALTER TABLE proposals ADD extra TEXT;
diff --git a/src/vit-servicing-station/vit-servicing-station-lib/src/db/models/proposals.rs b/src/vit-servicing-station/vit-servicing-station-lib/src/db/models/proposals.rs
@@ -119,7 +119,7 @@ pub struct Proposal {
     #[serde(alias = "reviewsCount")]
     pub reviews_count: i32,
     #[serde(alias = "extraFields")]
-    pub proposal_extra_fields: Option<ProposalExtraFields>,
+    pub extra: Option<ProposalExtraFields>,
 }
 
 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -301,7 +301,7 @@ where
             fund_id: row.24,
             challenge_id: row.16,
             reviews_count: row.18,
-            proposal_extra_fields: row.17.map(|s| {
+            extra: row.17.map(|s| {
                 serde_json::from_str(&s).expect("invalid value for proposal extra_fields")
             }),
         }
@@ -393,7 +393,7 @@ impl Insertable<proposals::table> for Proposal {
         diesel::dsl::Eq<proposals::chain_proposal_id, Vec<u8>>,
         diesel::dsl::Eq<proposals::chain_vote_options, String>,
         diesel::dsl::Eq<proposals::challenge_id, i32>,
-        diesel::dsl::Eq<proposals::proposal_extra_fields, Option<String>>,
+        diesel::dsl::Eq<proposals::extra, Option<String>>,
     );
 
     fn values(self) -> Self::Values {
@@ -414,9 +414,7 @@ impl Insertable<proposals::table> for Proposal {
             proposals::chain_proposal_id.eq(self.chain_proposal_id),
             proposals::chain_vote_options.eq(self.chain_vote_options.as_csv_string()),
             proposals::challenge_id.eq(self.challenge_id),
-            proposals::proposal_extra_fields.eq(self
-                .proposal_extra_fields
-                .map(|h| serde_json::to_string(&h).unwrap())),
+            proposals::extra.eq(self.extra.map(|h| serde_json::to_string(&h).unwrap())),
         )
     }
 }
@@ -550,7 +548,7 @@ pub mod test {
                 chain_vote_encryption_key: "none".to_string(),
                 fund_id: 1,
                 challenge_id: CHALLENGE_ID,
-                proposal_extra_fields: Some(
+                extra: Some(
                     vec![("key1", "value1"), ("key2", "value2")]
                         .into_iter()
                         .map(|(a, b)| (a.to_string(), b.to_string()))
@@ -606,8 +604,8 @@ pub mod test {
             proposals::chain_proposal_id.eq(proposal.chain_proposal_id.clone()),
             proposals::chain_vote_options.eq(proposal.chain_vote_options.as_csv_string()),
             proposals::challenge_id.eq(proposal.challenge_id),
-            proposals::proposal_extra_fields.eq(proposal
-                .proposal_extra_fields
+            proposals::extra.eq(proposal
+                .extra
                 .as_ref()
                 .map(|h| serde_json::to_string(h).unwrap())),
         );

diff --git a/src/vit-servicing-station/vit-servicing-station-lib/src/db/schema.rs b/src/vit-servicing-station/vit-servicing-station-lib/src/db/schema.rs
@@ -125,7 +125,7 @@ table! {
         chain_proposal_id -> Binary,
         chain_vote_options -> Text,
         challenge_id -> Integer,
-        proposal_extra_fields -> Nullable<Text>,
+        extra -> Nullable<Text>,
     }
 }
 

diff --git a/src/vit-servicing-station/vit-servicing-station-lib/src/db/views_schema.rs b/src/vit-servicing-station/vit-servicing-station-lib/src/db/views_schema.rs
@@ -19,7 +19,7 @@ table! {
         chain_proposal_id -> Binary,
         chain_vote_options -> Text,
         challenge_id -> Integer,
-        proposal_extra_fields -> Nullable<Text>,
+        extra -> Nullable<Text>,
 
         reviews_count -> Integer,
 

diff --git a/...ion/vit-servicing-station-tests/src/common/data/generator/arbitrary/snapshot_generator.rs b/...ion/vit-servicing-station-tests/src/common/data/generator/arbitrary/snapshot_generator.rs
@@ -150,7 +150,7 @@ impl ArbitrarySnapshotGenerator {
             chain_voteplan_payload: voteplan.chain_voteplan_payload.clone(),
             chain_vote_encryption_key: voteplan.chain_vote_encryption_key.clone(),
             fund_id: fund.id,
-            proposal_extra_fields: Some(
+            extra: Some(
                 vec![("key1", "value1"), ("key2", "value2")]
                     .into_iter()
                     .map(|(a, b)| (a.to_string(), b.to_string()))

diff --git a/...rvicing-station/vit-servicing-station-tests/src/common/data/generator/voting/generator.rs b/...rvicing-station/vit-servicing-station-tests/src/common/data/generator/voting/generator.rs
@@ -168,7 +168,7 @@ impl ValidVotePlanGenerator {
                     chain_vote_encryption_key: vote_plan.chain_vote_encryption_key.clone(),
                     fund_id: fund.id,
                     challenge_id: challenge.id,
-                    proposal_extra_fields: Some(
+                    extra: Some(
                         vec![("key1", "value1"), ("key2", "value2")]
                             .into_iter()
                             .map(|(a, b)| (a.to_string(), b.to_string()))

diff --git a/src/vit-servicing-station/vit-servicing-station-tests/src/common/db/mod.rs b/src/vit-servicing-station/vit-servicing-station-tests/src/common/db/mod.rs
@@ -103,8 +103,7 @@ impl<'a> DbInserter<'a> {
                 proposals::chain_vote_options
                     .eq(proposal.proposal.chain_vote_options.as_csv_string()),
                 proposals::challenge_id.eq(proposal.proposal.challenge_id),
-                proposals::proposal_extra_fields
-                    .eq(serde_json::to_string(&proposal.proposal.proposal_extra_fields).unwrap()),
+                proposals::extra.eq(serde_json::to_string(&proposal.proposal.extra).unwrap()),
             );
 
             insert_or_ignore_into_q!(conn, proposals::table, values)