Move several functions to TeamApiClient method

Author: Kobzol

src/github.rs

@@ -267,49 +267,6 @@ impl User {
     }
 }
 
-// Returns the ID of the given user, if the user is in the `all` team.
-pub async fn get_id_for_username(
-    client: &TeamApiClient,
-    login: &str,
-) -> anyhow::Result<Option<u64>> {
-    let permission = client.teams().await?;
-    let map = permission.teams;
-    let login = login.to_lowercase();
-    Ok(map["all"]
-        .members
-        .iter()
-        .find(|g| g.github.to_lowercase() == login)
-        .map(|u| u.github_id))
-}
-
-pub async fn get_team(
-    client: &TeamApiClient,
-    team: &str,
-) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
-    let permission = client.teams().await?;
-    let mut map = permission.teams;
-    Ok(map.swap_remove(team))
-}
-
-/// Fetches a Rust team via its GitHub team name.
-pub async fn get_team_by_github_name(
-    client: &TeamApiClient,
-    org: &str,
-    team: &str,
-) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
-    let teams = client.teams().await?;
-    for rust_team in teams.teams.into_values() {
-        if let Some(github) = &rust_team.github {
-            for gh_team in &github.teams {
-                if gh_team.org == org && gh_team.name == team {
-                    return Ok(Some(rust_team));
-                }
-            }
-        }
-    }
-    Ok(None)
-}
-
 #[derive(PartialEq, Eq, Debug, Clone, serde::Deserialize)]
 pub struct Label {
     pub name: String,

src/handlers/notification.rs

@@ -5,7 +5,6 @@
 //! Parsing is done in the `parser::command::ping` module.
 
 use crate::db::{notifications, users};
-use crate::github::get_id_for_username;
 use crate::{
     github::{self, Event},
     handlers::Context,
@@ -69,7 +68,11 @@ pub(super) async fn handle(ctx: &Context, event: &Event) -> anyhow::Result<()> {
     //
     // If the user intended to ping themselves, they can add the GitHub comment
     // via the Zulip interface.
-    match get_id_for_username(&ctx.team_api, &event.user().login).await {
+    match ctx
+        .team_api
+        .get_gh_id_from_username(&event.user().login)
+        .await
+    {
         Ok(Some(id)) => {
             users_notified.insert(id.try_into().unwrap());
         }
@@ -136,7 +139,7 @@ async fn id_from_user(
         //
         // We may also want to be able to categorize into these buckets
         // *after* the ping occurs and is initially processed.
-        let team = match github::get_team_by_github_name(&ctx.team_api, org, team).await {
+        let team = match ctx.team_api.get_team_by_github_name(org, team).await {
             Ok(Some(team)) => team,
             Ok(None) => {
                 // If the team is in rust-lang*, then this is probably an error (potentially user
@@ -170,7 +173,9 @@ async fn id_from_user(
             Some(team.name),
         )))
     } else {
-        let id = get_id_for_username(&ctx.team_api, login)
+        let id = ctx
+            .team_api
+            .get_gh_id_from_username(login)
             .await
             .with_context(|| format!("failed to get user {} ID", login))?;
         let Some(id) = id else {

src/handlers/ping.rs

@@ -49,7 +49,7 @@ pub(super) async fn handle_command(
             return Ok(());
         }
     };
-    let team = github::get_team(&ctx.team_api, &gh_team).await?;
+    let team = ctx.team_api.get_team(&gh_team).await?;
     let team = match team {
         Some(team) => team,
         None => {

src/handlers/project_goals.rs

@@ -7,7 +7,6 @@ use crate::jobs::Job;
 use crate::team_data::TeamApiClient;
 use crate::zulip::api::Recipient;
 use crate::zulip::client::ZulipClient;
-use crate::zulip::to_zulip_id;
 use anyhow::Context as _;
 use async_trait::async_trait;
 use chrono::{Datelike, NaiveDate, Utc};
@@ -53,7 +52,7 @@ pub async fn check_project_goal_acl(
 ) -> anyhow::Result<bool> {
     const GOALS_TEAM: &str = "goals";
 
-    let team = match github::get_team(team_api_client, GOALS_TEAM).await {
+    let team = match team_api_client.get_team(GOALS_TEAM).await {
         Ok(Some(team)) => team,
         Ok(None) => {
             log::info!("team ({}) failed to resolve to a known team", GOALS_TEAM);
@@ -237,8 +236,8 @@ async fn zulip_owners(
     })
 }
 
-async fn owner_string(team_api_client: &TeamApiClient, assignee: &User) -> anyhow::Result<String> {
-    if let Some(zulip_id) = to_zulip_id(team_api_client, assignee.id).await? {
+async fn owner_string(team_api: &TeamApiClient, assignee: &User) -> anyhow::Result<String> {
+    if let Some(zulip_id) = team_api.github_to_zulip_id(assignee.id).await? {
         Ok(format!("@**|{zulip_id}**"))
     } else {
         // No zulip-id? Fallback to github user name.

src/team_data.rs

@@ -22,6 +22,67 @@ impl TeamApiClient {
         }
     }
 
+    pub async fn zulip_to_github_id(&self, zulip_id: u64) -> anyhow::Result<Option<u64>> {
+        let map = self.zulip_map().await?;
+        Ok(map.users.get(&zulip_id).copied())
+    }
+
+    pub async fn username_from_gh_id(&self, github_id: u64) -> anyhow::Result<Option<String>> {
+        let people_map = self.people().await?;
+        Ok(people_map
+            .people
+            .into_iter()
+            .filter(|(_, p)| p.github_id == github_id)
+            .map(|p| p.0)
+            .next())
+    }
+
+    // Returns the ID of the given user, if the user is in the `all` team.
+    pub async fn get_gh_id_from_username(&self, login: &str) -> anyhow::Result<Option<u64>> {
+        let permission = self.teams().await?;
+        let map = permission.teams;
+        let login = login.to_lowercase();
+        Ok(map["all"]
+            .members
+            .iter()
+            .find(|g| g.github.to_lowercase() == login)
+            .map(|u| u.github_id))
+    }
+
+    pub async fn github_to_zulip_id(&self, github_id: u64) -> anyhow::Result<Option<u64>> {
+        let map = self.zulip_map().await?;
+        Ok(map
+            .users
+            .iter()
+            .find(|&(_, &github)| github == github_id)
+            .map(|v| *v.0))
+    }
+
+    pub async fn get_team(&self, team: &str) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
+        let permission = self.teams().await?;
+        let mut map = permission.teams;
+        Ok(map.swap_remove(team))
+    }
+
+    /// Fetches a Rust team via its GitHub team name.
+    pub async fn get_team_by_github_name(
+        &self,
+        org: &str,
+        team: &str,
+    ) -> anyhow::Result<Option<rust_team_data::v1::Team>> {
+        let teams = self.teams().await?;
+        for rust_team in teams.teams.into_values() {
+            if let Some(github) = &rust_team.github {
+                for gh_team in &github.teams {
+                    if gh_team.org == org && gh_team.name == team {
+                        return Ok(Some(rust_team));
+                    }
+                }
+            }
+        }
+        Ok(None)
+    }
+
     pub async fn zulip_map(&self) -> anyhow::Result<ZulipMapping> {
         download(&self.client, &self.base_url, "/zulip-map.json")
             .await

src/zulip.rs

@@ -5,12 +5,11 @@ mod commands;
 use crate::db::notifications::add_metadata;
 use crate::db::notifications::{self, delete_ping, move_indices, record_ping, Identifier};
 use crate::db::review_prefs::{get_review_prefs, upsert_review_prefs, RotationMode};
-use crate::github::{get_id_for_username, User};
+use crate::github::User;
 use crate::handlers::docs_update::docs_update;
 use crate::handlers::pr_tracking::get_assigned_prs;
 use crate::handlers::project_goals::{self, ping_project_goals_owners};
 use crate::handlers::Context;
-use crate::team_data::TeamApiClient;
 use crate::utils::pluralize;
 use crate::zulip::api::{MessageApiResponse, Recipient};
 use crate::zulip::client::ZulipClient;
@@ -83,33 +82,6 @@ struct Response {
     content: String,
 }
 
-pub async fn to_github_id(client: &TeamApiClient, zulip_id: u64) -> anyhow::Result<Option<u64>> {
-    let map = client.zulip_map().await?;
-    Ok(map.users.get(&zulip_id).copied())
-}
-
-pub async fn username_from_gh_id(
-    client: &TeamApiClient,
-    gh_id: u64,
-) -> anyhow::Result<Option<String>> {
-    let people_map = client.people().await?;
-    Ok(people_map
-        .people
-        .into_iter()
-        .filter(|(_, p)| p.github_id == gh_id)
-        .map(|p| p.0)
-        .next())
-}
-
-pub async fn to_zulip_id(client: &TeamApiClient, github_id: u64) -> anyhow::Result<Option<u64>> {
-    let map = client.zulip_map().await?;
-    Ok(map
-        .users
-        .iter()
-        .find(|&(_, &github)| github == github_id)
-        .map(|v| *v.0))
-}
-
 /// Top-level handler for Zulip webhooks.
 ///
 /// Returns a JSON response.
@@ -157,7 +129,7 @@ async fn process_zulip_request(ctx: &Context, req: Request) -> anyhow::Result<Op
     log::trace!("zulip hook: {req:?}");
 
     // Zulip commands are only available to users in the team database
-    let gh_id = match to_github_id(&ctx.team_api, req.message.sender_id).await {
+    let gh_id = match ctx.team_api.zulip_to_github_id(req.message.sender_id).await {
         Ok(Some(gh_id)) => gh_id,
         Ok(None) => {
             return Err(anyhow::anyhow!(
@@ -187,7 +159,9 @@ async fn handle_command<'a>(
         let mut impersonated = false;
         if let Some(&"as") = words.get(0) {
             if let Some(username) = words.get(1) {
-                let impersonated_gh_id = match get_id_for_username(&ctx.github, username)
+                let impersonated_gh_id = match ctx
+                    .team_api
+                    .get_gh_id_from_username(username)
                     .await
                     .context("getting ID of github user")?
                 {
@@ -228,7 +202,9 @@ async fn handle_command<'a>(
 
         // Let the impersonated person know about the impersonation if the command was sensitive
         if impersonated && is_sensitive_command(&cmd) {
-            let impersonated_zulip_id = to_zulip_id(&ctx.github, gh_id)
+            let impersonated_zulip_id = ctx
+                .team_api
+                .github_to_zulip_id(gh_id)
                 .await?
                 .ok_or_else(|| anyhow::anyhow!("Zulip user for GitHub ID {gh_id} was not found"))?;
             let users = ctx.zulip.get_zulip_users().await?;
@@ -332,7 +308,9 @@ async fn workqueue_commands(
 ) -> anyhow::Result<Option<String>> {
     let db_client = ctx.db.get().await;
 
-    let gh_username = username_from_gh_id(&ctx.team_api, gh_id)
+    let gh_username = ctx
+        .team_api
+        .username_from_gh_id(gh_id)
         .await?
         .ok_or_else(|| anyhow::anyhow!("Cannot find your GitHub username in the team database"))?;
     let user = User {
@@ -440,7 +418,9 @@ async fn workqueue_commands(
 
 /// The `whoami` command displays the user's membership in Rust teams.
 async fn whoami_cmd(ctx: &Context, gh_id: u64) -> anyhow::Result<Option<String>> {
-    let gh_username = username_from_gh_id(&ctx.team_api, gh_id)
+    let gh_username = ctx
+        .team_api
+        .username_from_gh_id(gh_id)
         .await?
         .ok_or_else(|| anyhow::anyhow!("Cannot find your GitHub username in the team database"))?;
     let teams = ctx
@@ -531,10 +511,10 @@ async fn lookup_github_username(ctx: &Context, zulip_username: &str) -> anyhow::
         Some(name) => name.to_string(),
         None => {
             let zulip_id = zulip_user.user_id;
-            let Some(gh_id) = to_github_id(&ctx.team_api, zulip_id).await? else {
+            let Some(gh_id) = ctx.team_api.zulip_to_github_id(zulip_id).await? else {
                 return Ok(format!("Zulip user {zulip_username} was not found in team Zulip mapping. Maybe they do not have zulip-id configured in team."));
             };
-            let Some(username) = username_from_gh_id(&ctx.team_api, gh_id).await? else {
+            let Some(username) = ctx.team_api.username_from_gh_id(gh_id).await? else {
                 return Ok(format!(
                     "Zulip user {zulip_username} was not found in the team database."
                 ));
@@ -593,7 +573,7 @@ async fn lookup_zulip_username(ctx: &Context, gh_username: &str) -> anyhow::Resu
             return Ok(None);
         };
 
-        let Some(zulip_id) = to_zulip_id(&ctx.team_api, person.github_id).await? else {
+        let Some(zulip_id) = ctx.team_api.github_to_zulip_id(person.github_id).await? else {
             return Ok(None);
         };
         Ok(Some(zulip_id))