Add votes closer + some refactoring

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

.gitattributes

@@ -0,0 +1 @@
+templates/* -linguist-detectable

Cargo.lock

@@ -24,9 +24,10 @@ serde = { version = "1.0.137", features = ["derive"] }
 serde_json = "1.0.81"
 serde_yaml = "0.8.24"
 sha2 = "0.10.2"
-tokio = {version = "1.18.2", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = {version = "1.18.2", features = ["macros", "rt-multi-thread", "signal", "time"] }
 tokio-postgres = { version = "0.7.6", features = ["with-uuid-1", "with-serde_json-1", "with-time-0_3"] }
 tower = "0.4.12"
 tower-http = { version = "0.3.3", features = ["trace"] }
 tracing = "0.1.34"
 tracing-subscriber = "0.3.11"
+uuid = "1.1.0"

Cargo.toml

@@ -8,4 +8,3 @@ tern status --config $TERN_CONF --version-table $schemaVersionTable
 tern migrate --config $TERN_CONF --version-table $schemaVersionTable
 if [ $? -ne 0 ]; then exit 1; fi
 echo "Done"
-

database/migrations/migrate.sh

@@ -2,6 +2,7 @@ create extension if not exists pgcrypto;
 
 create table if not exists vote (
     vote_id uuid primary key default gen_random_uuid(),
+    vote_comment_id bigint not null,
     created_at timestamptz default current_timestamp not null,
     ends_at timestamptz not null,
     closed boolean not null default false,

database/migrations/schema/001_initial.sql

@@ -9,17 +9,16 @@ voters:
 
 # Pass threshold (required)
 # Percentage of votes required to pass the vote
-passThreshold: 67
+pass_threshold: 67
 
 # Voting duration (required)
 # How long the vote will be open
 #
-# Units supported (can be combined as in 5mins 30s):
+# Units supported (can be combined as in 1hour 30mins):
 #
-#   seconds | second | secs | sec | s
 #   minutes | minute | mins | min | m
 #   hours   | hour   | hrs  | hrs | h
 #   days    | day    | d
 #   weeks   | week   | w
 #
-duration: 5mins 30s
+duration: 5m

docs/metadata/.gitvote.yml

@@ -69,6 +69,12 @@ pub(crate) struct Issue {
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct Repository {
+pub(crate) struct Repository {
     pub full_name: String,
 }
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub(crate) struct Reaction {
+    pub user: User,
+    pub content: String,
+}

src/events.rs

@@ -1,12 +1,14 @@
-use crate::votes::Processor;
 use anyhow::{Context, Result};
 use clap::Parser;
 use config::{Config, File};
 use deadpool_postgres::{Config as DbConfig, Runtime};
 use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode};
 use postgres_openssl::MakeTlsConnector;
 use std::{net::SocketAddr, path::PathBuf, sync::Arc};
-use tokio::{signal, sync::mpsc};
+use tokio::{
+    signal,
+    sync::{broadcast, mpsc},
+};
 use tracing::info;
 
 mod events;
@@ -50,7 +52,9 @@ async fn main() -> Result<()> {
 
     // Setup and launch votes processor
     let (cmds_tx, cmds_rx) = mpsc::channel(100);
-    let processor_done = Processor::start(cfg.clone(), db, cmds_rx)?;
+    let (stop_tx, _): (broadcast::Sender<()>, _) = broadcast::channel(1);
+    let votes_processor = votes::Processor::new(cfg.clone(), db)?;
+    let votes_processor_done = votes_processor.start(cmds_rx, stop_tx.clone());
 
     // Setup and launch HTTP server
     let router = handlers::setup_router(cmds_tx).await?;
@@ -63,8 +67,9 @@ async fn main() -> Result<()> {
         .unwrap();
     info!("gitvote service stopped");
 
-    // Wait for votes processor to finish
-    processor_done.await;
+    // Ask votes processor to stop and wait for it to finish
+    drop(stop_tx);
+    votes_processor_done.await;
 
     Ok(())
 }

src/main.rs

@@ -8,7 +8,6 @@ pub const METADATA_FILE: &str = ".gitvote.yml";
 
 /// GitVote metadata.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
 pub(crate) struct Metadata {
     pub voters: Vec<String>,
     pub pass_threshold: f64,

src/metadata.rs

@@ -1,9 +1,9 @@
 use crate::{
     events::IssueCommentEvent,
     metadata::{Metadata, METADATA_FILE},
+    votes::VoteResults,
 };
 use askama::Template;
-use std::collections::HashMap;
 
 /// Template for the vote created comment.
 #[derive(Debug, Clone, Template)]
@@ -19,6 +19,7 @@ pub(crate) struct VoteCreated<'a> {
 }
 
 impl<'a> VoteCreated<'a> {
+    /// Create a new VoteCreated template.
     pub(crate) fn new(event: &'a IssueCommentEvent, md: &'a Metadata) -> Self {
         Self {
             creator: &event.comment.user.login,
@@ -39,12 +40,12 @@ impl<'a> VoteCreated<'a> {
 #[derive(Debug, Clone, Template)]
 #[template(path = "vote-closed.md")]
 pub(crate) struct VoteClosed<'a> {
-    passed: bool,
-    in_favor_percentage: f64,
-    pass_threshold: f64,
-    in_favor: u64,
-    against: u64,
-    abstain: u64,
-    not_voted: u64,
-    voters: HashMap<&'a str, &'a str>,
+    results: &'a VoteResults,
+}
+
+impl<'a> VoteClosed<'a> {
+    /// Create a new VoteClosed template.
+    pub(crate) fn new(results: &'a VoteResults) -> Self {
+        Self { results }
+    }
 }