Merge pull request #1623 from apiraino/feat/add-all-compiler-wg-meetings

WG-prioritization: retrieve all T-compiler WG meetings

Author: spastorino

src/actions.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, Duration, Utc};
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -7,7 +7,10 @@ use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
 
-use crate::github::{self, GithubClient, Repository};
+use crate::{
+    github::{self, GithubClient, Repository},
+    http_client::{CompilerMeeting, HttpClient},
+};
 
 #[async_trait]
 pub trait Action {
@@ -86,6 +89,15 @@ impl<'a> Action for Step<'a> {
     async fn call(&self) -> anyhow::Result<String> {
         let gh = GithubClient::new_with_default_token(Client::new());
 
+        // retrieve all Rust compiler meetings
+        // from today for 7 days
+        let today: chrono::DateTime<chrono::Local> = chrono::Local::now();
+        let tcompiler_meetings: Vec<CompilerMeeting> =
+            CompilerMeeting::get_meetings(today, today + Duration::days(7))
+                .await
+                .map_err(|e| format!("Meetings couldn't be retrieved: {:?}", e))
+                .unwrap_or_default();
+
         let mut context = Context::new();
         let mut results = HashMap::new();
 
@@ -143,6 +155,9 @@ impl<'a> Action for Step<'a> {
         let date = chrono::Utc::today().format("%Y-%m-%d").to_string();
         context.insert("CURRENT_DATE", &date);
 
+        // populate T-compiler meetings
+        context.insert("meetings_tcompiler", &tcompiler_meetings);
+
         Ok(TEMPLATES
             .render(&format!("{}.tt", self.name), &context)
             .unwrap())

src/http_client/mod.rs

@@ -0,0 +1,72 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use reqwest::Url;
+
+#[derive(serde::Deserialize, serde::Serialize, Debug)]
+pub struct CompilerMeetings {
+    items: Vec<CompilerMeeting>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize, Debug)]
+pub struct Start {
+    #[serde(rename(deserialize = "dateTime"))]
+    date_time: String,
+}
+
+#[derive(serde::Deserialize, serde::Serialize, Debug)]
+pub struct CompilerMeeting {
+    summary: String,
+    #[serde(rename(deserialize = "htmlLink"))]
+    html_link: String,
+    #[serde(rename(deserialize = "originalStartTime"))]
+    original_start: Option<Start>,
+    start: Option<Start>,
+}
+
+#[async_trait]
+pub trait HttpClient {
+    async fn get_meetings(
+        start_date: chrono::DateTime<chrono::Local>,
+        end_date: chrono::DateTime<chrono::Local>,
+    ) -> Result<Vec<CompilerMeeting>>
+    where
+        Self: Sized;
+}
+
+#[async_trait]
+impl HttpClient for CompilerMeeting {
+    /// Retrieve all meetings from the Rust Compiler Team Calendar in a date range
+    /// If a Google API auth token is not provided just return
+    // Google calendar API documentation:
+    // https://developers.google.com/calendar/api/v3/reference/events/list
+    // The API token needs only one permission: https://www.googleapis.com/auth/calendar.events.readonly
+    async fn get_meetings(
+        start_date: chrono::DateTime<chrono::Local>,
+        end_date: chrono::DateTime<chrono::Local>,
+    ) -> Result<Vec<CompilerMeeting>> {
+        let api_key = match std::env::var("GOOGLE_API_KEY") {
+            Ok(v) => v,
+            Err(_) => {
+                return Ok(vec![]);
+            }
+        };
+        let google_calendar_id = "6u5rrtce6lrtv07pfi3damgjus%40group.calendar.google.com";
+        let time_min = format!("{}T00:00:00+00:00", start_date.format("%F").to_string());
+        let time_max = format!("{}T23:59:59+00:00", end_date.format("%F").to_string());
+        let url = Url::parse_with_params(
+            &format!(
+                "https://www.googleapis.com/calendar/v3/calendars/{}/events",
+                google_calendar_id
+            ),
+            &[
+                // see google docs for the meaning of these values
+                ("key", api_key),
+                ("timeMin", time_min),
+                ("timeMax", time_max),
+                ("singleEvents", "true".to_string()),
+            ],
+        )?;
+        let calendar = reqwest::get(url).await?.json::<CompilerMeetings>().await?;
+        Ok(calendar.items)
+    }
+}

src/lib.rs

@@ -18,6 +18,7 @@ pub mod config;
 pub mod db;
 pub mod github;
 pub mod handlers;
+pub mod http_client;
 pub mod interactions;
 pub mod notification_listing;
 pub mod payload;

templates/_meetings.tt

@@ -0,0 +1,5 @@
+{% macro render(meetings, empty="No other meetings scheduled.") %}
+{%- for mtg in meetings %}
+- [{{ mtg.summary }}]({{ mtg.html_link }}) at <time:{{ mtg.start.date_time }}>{% else %}
+- {{empty}}{% endfor -%}
+{% endmacro %}

templates/prioritization_agenda.tt

@@ -1,4 +1,5 @@
 {% import "_issues.tt" as issues %}
+{% import "_meetings.tt" as meetings %}
 
 ---
 tags: weekly, rustc
@@ -10,6 +11,9 @@ tags: weekly, rustc
 
 ## Announcements
 
+### Other WG meetings ([calendar link](https://calendar.google.com/calendar/embed?src=6u5rrtce6lrtv07pfi3damgjus%40group.calendar.google.com))
+{{-meetings::render(meetings=meetings_tcompiler, empty="No meetings scheduled for next week")}}
+
 - New MCPs (take a look, see if you like them!)
 {{-issues::render(issues=mcp_new_not_seconded, indent="  ", empty="No new proposals this time.")}}
 - Old MCPs (not seconded, take a look)