WIP

.github/workflows/ci-tests-n-coverage.yml

@@ -29,6 +29,7 @@ jobs:
         image: postgres:15
         env:
           POSTGRES_PASSWORD: 123456
+          LC_ALL: C # string sorting in tests expect this
         options:
           >-
           --health-cmd pg_isready

.github/workflows/rust.yml

@@ -123,6 +123,7 @@ jobs:
         image: postgres:15
         env:
           POSTGRES_PASSWORD: 123456
+          LC_ALL: C # string sorting in tests expect this
         options:
           >-
           --health-cmd pg_isready

src/election-db/migrations/2022-12-01-043118_vit-ss/up.sql

@@ -136,7 +136,7 @@ Do not use this VIEW for new queries, its ONLY for backward compatibility.';
 -- VIT-SS Compatibility View - api_tokens table.
 
 CREATE VIEW api_tokens AS SELECT
-    DECODE(config.id2, 'base64') AS token,
+    DECODE(config.id2, 'base64')::BYTEA AS token,
     (config.value->'created')::BIGINT AS creation_time,
     (config.value->'expires')::BIGINT AS expire_time
 FROM config
@@ -240,7 +240,7 @@ COMMENT ON COLUMN votes.raw_fragment is 'TODO';
 
 CREATE TABLE snapshots (
     tag TEXT PRIMARY KEY,
-    last_updated TIMESTAMP NOT NULL
+    last_updated BIGINT NOT NULL
 );
 
 COMMENT ON TABLE snapshots IS 'Something to do with snapshots. VIT-SS Compatibility Table, to be replaced when analysis completed.';

src/election-db/src/schema.rs

@@ -585,10 +585,10 @@ diesel::table! {
         tag -> Text,
         /// The `last_updated` column of the `snapshots` table.
         ///
-        /// Its SQL type is `Timestamp`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        last_updated -> Timestamp,
+        last_updated -> Int8,
     }
 }
 
@@ -964,7 +964,6 @@ diesel::joinable!(challenge -> challenge_category (category));
 diesel::joinable!(challenge -> currency (rewards_currency));
 diesel::joinable!(challenge -> election (election));
 diesel::joinable!(challenge -> vote_options (vote_options));
-diesel::joinable!(community_advisors_review -> proposal (proposal_id));
 diesel::joinable!(contributions -> snapshots (snapshot_tag));
 diesel::joinable!(goal -> election (election_id));
 diesel::joinable!(proposal_voteplan -> proposal (proposal_id));

src/vit-servicing-station/vit-servicing-station-tests/src/common/data/generator/voting/template/arbitrary.rs

@@ -225,7 +225,7 @@ impl ValidVotingTemplateGenerator for ArbitraryValidVotingTemplateGenerator {
         let proposal_id = self
             .proposals
             .get(self.generator.random_index(self.proposals.len()))
-            .map(|proposal| proposal.internal_id.clone())
+            .map(|proposal| proposal.proposal_id.clone())
             .unwrap();
         let ranking = match self.generator.next_u32() % 2 {
             0 => ReviewRanking::Excellent,

src/vit-servicing-station/vit-servicing-station-tests/src/common/db/mod.rs

@@ -40,7 +40,7 @@ impl<'a> DbInserter<'a> {
             config::id3.eq(""),
             config::value.eq(serde_json::json!({
                 "created": token_data.creation_time,
-                "expired": token_data.expire_time,
+                "expires": token_data.expire_time,
             })),
         );
 

src/vit-servicing-station/vit-servicing-station-tests/src/tests/cli/load.rs

@@ -8,7 +8,7 @@ use assert_cmd::assert::OutputAssertExt;
 use assert_fs::{fixture::PathChild, TempDir};
 
 #[test]
-#[ignore = "..."]
+#[ignore = "Loading data will be done by the importers, not using the CLI"]
 pub fn load_data_test() {
     let temp_dir = TempDir::new().unwrap().into_persistent();
     let db_url = DbBuilder::new().build().unwrap();

src/vit-servicing-station/vit-servicing-station-tests/src/tests/cli/token.rs

@@ -51,7 +51,7 @@ pub fn generate_token_for_given_size_and_n() {
 }
 
 #[test]
-#[ignore = "..."]
+#[ignore = "Loading data will be done by the importers, not using the CLI"]
 pub fn add_generated_token_to_db() -> Result<(), Box<dyn Error>> {
     let temp_dir = TempDir::new().unwrap();
     let (server, _snapshot) = quick_start(&temp_dir).unwrap();

src/vit-servicing-station/vit-servicing-station-tests/src/tests/rest/search.rs

@@ -300,6 +300,8 @@ pub fn sort_proposals_result_by_funds_asc() {
 
 #[test]
 pub fn sort_proposals_result_by_title_desc() {
+    use pretty_assertions::assert_eq;
+
     let temp_dir = TempDir::new().unwrap();
     let (server, data) = quick_start(&temp_dir).unwrap();
     let rest_client = server.rest_client_with_token(&data.token_hash());

src/vit-servicing-station/vit-servicing-station-tests/src/tests/rest/token.rs

@@ -22,7 +22,11 @@ pub fn token_validation() -> Result<(), Box<dyn std::error::Error>> {
     let invalid_token = data::token_hash();
 
     let rest_client: RawRestClient = server.rest_client_with_token(&hash).into();
-    assert_eq!(rest_client.health()?.status(), StatusCode::OK);
+    let res = rest_client.health()?;
+    let status = res.status();
+    println!("{:?}", res.text());
+
+    assert_eq!(status, StatusCode::OK);
 
     let rest_client: RawRestClient = server.rest_client_with_token(&invalid_token).into();
     assert_eq!(rest_client.health()?.status(), StatusCode::UNAUTHORIZED);