models/team: Inline team_with_gh_id_contains_user() fn

Author: Turbo87

src/controllers/krate/owners.rs

@@ -2,7 +2,6 @@
 
 use crate::controllers::krate::CratePath;
 use crate::models::krate::OwnerRemoveError;
-use crate::models::team::team_with_gh_id_contains_user;
 use crate::models::{
     krate::NewOwnerInvite, token::EndpointScope, CrateOwner, NewCrateOwnerInvitation,
     NewCrateOwnerInvitationOutcome, NewTeam,
@@ -411,9 +410,13 @@ pub async fn create_or_update_github_team(
     let org_id = team.organization.id;
     let gh_login = &req_user.gh_login;
 
-    let can_add_team = team_with_gh_id_contains_user(gh_client, org_id, team.id, gh_login, &token)
+    let is_team_member = gh_client
+        .team_membership(org_id, team.id, gh_login, &token)
         .await?
-        || is_gh_org_owner(gh_client, org_id, gh_login, &token).await?;
+        .is_some_and(|m| m.is_active());
+
+    let can_add_team =
+        is_team_member || is_gh_org_owner(gh_client, org_id, gh_login, &token).await?;
 
     if !can_add_team {
         return Err(custom(

src/models/team.rs

@@ -64,7 +64,10 @@ impl Team {
         gh_login: &str,
         token: &AccessToken,
     ) -> Result<bool, GitHubError> {
-        team_with_gh_id_contains_user(gh_client, self.org_id, self.github_id, gh_login, token).await
+        Ok(gh_client
+            .team_membership(self.org_id, self.github_id, gh_login, token)
+            .await?
+            .is_some_and(|m| m.is_active()))
     }
 
     pub async fn owning(krate: &Crate, conn: &mut AsyncPgConnection) -> QueryResult<Vec<Owner>> {
@@ -81,22 +84,3 @@ impl Team {
         Ok(teams.collect())
     }
 }
-
-pub async fn team_with_gh_id_contains_user(
-    gh_client: &dyn GitHubClient,
-    github_org_id: i32,
-    github_team_id: i32,
-    gh_login: &str,
-    token: &AccessToken,
-) -> Result<bool, GitHubError> {
-    // GET /organizations/:org_id/team/:team_id/memberships/:username
-    // check that "state": "active"
-
-    let membership = gh_client
-        .team_membership(github_org_id, github_team_id, gh_login, token)
-        .await?;
-
-    // There is also `state: pending` for which we could possibly give
-    // some feedback, but it's not obvious how that should work.
-    Ok(membership.is_some_and(|m| m.is_active()))
-}