schema: allow alumni to have roles

This enables the compiler team to recognise their alumni for the role
that they held while active.

Author: davidtwco

src/schema.rs

@@ -308,18 +308,14 @@ impl Team {
             let alumni = data
                 .teams()
                 .chain(data.archived_teams())
-                .flat_map(|t| t.alumni())
-                .map(|a| a.as_str())
+                .flat_map(|t| t.explicit_alumni())
+                .map(|a| a.github.as_str())
                 .filter(|person| !active_members.contains(person));
             members.extend(alumni);
         }
         Ok(members)
     }
 
-    pub(crate) fn alumni(&self) -> &[String] {
-        self.people.alumni.as_ref().map_or(&[], Vec::as_slice)
-    }
-
     pub(crate) fn raw_lists(&self) -> &[TeamList] {
         &self.lists
     }
@@ -478,6 +474,10 @@ impl Team {
         &self.people.members
     }
 
+    pub(crate) fn explicit_alumni(&self) -> &[TeamMember] {
+        self.people.alumni.as_ref().map_or(&[], Vec::as_slice)
+    }
+
     pub(crate) fn contains_person(&self, data: &Data, person: &Person) -> Result<bool, Error> {
         let members = self.members(data)?;
         Ok(members.contains(person.github()))
@@ -525,7 +525,7 @@ impl std::cmp::Ord for GitHubTeam<'_> {
 pub(crate) struct TeamPeople {
     pub leads: Vec<String>,
     pub members: Vec<TeamMember>,
-    pub alumni: Option<Vec<String>>,
+    pub alumni: Option<Vec<TeamMember>>,
     #[serde(default)]
     pub included_teams: Vec<String>,
     #[serde(default = "default_false")]

src/static_api.rs

@@ -138,6 +138,9 @@ impl<'a> Generator<'a> {
             for member in team.explicit_members().iter().cloned() {
                 website_roles.insert(member.github, member.roles);
             }
+            for alum in team.explicit_alumni().iter().cloned() {
+                website_roles.insert(alum.github, alum.roles);
+            }
 
             let leads = team.leads();
             let mut members = Vec::new();
@@ -156,14 +159,17 @@ impl<'a> Generator<'a> {
             members.sort_by_key(|member| !member.is_lead);
 
             let mut alumni = Vec::new();
-            for github_name in team.alumni() {
-                if let Some(person) = self.data.person(github_name) {
+            for alum in team.explicit_alumni() {
+                if let Some(person) = self.data.person(&alum.github) {
                     alumni.push(v1::TeamMember {
                         name: person.name().into(),
-                        github: github_name.to_string(),
+                        github: alum.github.to_string(),
                         github_id: person.github_id(),
                         is_lead: false,
-                        roles: Vec::new(),
+                        roles: website_roles
+                            .get(alum.github.as_str())
+                            .cloned()
+                            .unwrap_or_default(),
                     });
                 }
             }

src/validate.rs

@@ -302,8 +302,8 @@ fn validate_inactive_members(data: &Data, errors: &mut Vec<String>) {
             for member in members {
                 referenced_members.insert(member);
             }
-            for person in team.alumni() {
-                referenced_members.insert(person);
+            for person in team.explicit_alumni() {
+                referenced_members.insert(person.github.as_str());
             }
             for list in team.raw_lists() {
                 for person in &list.extra_people {