Show proposal status

elections/src/events.rs

@@ -1,4 +1,4 @@
-use near_sdk::{serde::Serialize, AccountId};
+use near_sdk::{serde::Serialize};
 use serde_json::json;
 
 use common::{EventPayload, NearEvent};
@@ -21,7 +21,7 @@ pub(crate) fn emit_vote(prop_id: u32) {
 
 #[cfg(test)]
 mod unit_tests {
-    use near_sdk::test_utils;
+    use near_sdk::{test_utils, AccountId};
 
     use super::*;
 

elections/src/lib.rs

@@ -615,6 +615,33 @@ mod unit_tests {
         assert_eq!(res.unwrap(), policy1());
     }
 
+    #[test]
+    fn proposal_status_query() {
+        let (mut ctx, mut ctr) = setup(&admin());
+
+        let prop_id = mk_proposal(&mut ctr);
+        let mut res = ctr.proposal_status(prop_id);
+        assert_eq!(res, ProposalStatus::BEFORE);
+
+        ctx.block_timestamp = (START + 2) * MSECOND;
+        testing_env!(ctx.clone());
+
+        res = ctr.proposal_status(prop_id);
+        assert_eq!(res, ProposalStatus::ONGOING);
+
+        ctx.block_timestamp = (START + 11) * MSECOND;
+        testing_env!(ctx.clone());
+
+        res = ctr.proposal_status(prop_id);
+        assert_eq!(res, ProposalStatus::COOLDOWN);
+
+        ctx.block_timestamp = (START + 111) * MSECOND;
+        testing_env!(ctx.clone());
+
+        res = ctr.proposal_status(prop_id);
+        assert_eq!(res, ProposalStatus::ENDED);
+    }
+
     #[test]
     #[should_panic(expected = "double vote for the same candidate")]
     fn vote_double_vote_same_candidate() {

elections/src/proposal.rs

@@ -17,6 +17,16 @@ pub enum HouseType {
     TransparencyCommission,
 }
 
+#[derive(Serialize, Deserialize)]
+#[serde(crate = "near_sdk::serde")]
+#[cfg_attr(test, derive(Debug, PartialEq))]
+pub enum ProposalStatus {
+    BEFORE,
+    ONGOING,
+    COOLDOWN,
+    ENDED
+}
+
 #[derive(BorshDeserialize, BorshSerialize)]
 #[cfg_attr(test, derive(Debug))]
 pub struct Proposal {

elections/src/view.rs

@@ -1,4 +1,4 @@
-use near_sdk::{near_bindgen, AccountId};
+use near_sdk::{near_bindgen, AccountId, env};
 use uint::hex;
 
 use crate::proposal::*;
@@ -31,4 +31,19 @@ impl Contract {
             .get(&user)
             .map(|policy| hex::encode(policy))
     }
+
+    /// Returns the proposal status
+    pub fn proposal_status(&self, prop_id: u32) -> ProposalStatus {
+        let proposal = self._proposal(prop_id);
+        let current_time = env::block_timestamp_ms();
+        if current_time < proposal.start {
+            return ProposalStatus::BEFORE;
+        } else if current_time >= proposal.start && current_time <= proposal.end {
+            return ProposalStatus::ONGOING;
+        } else if current_time > proposal.end && current_time <= (proposal.cooldown + proposal.end) {
+            return ProposalStatus::COOLDOWN;
+        } else {
+            return ProposalStatus::ENDED;
+        }
+    }
 }