From e51469a5d437491071610156d56dcb73191ad61c Mon Sep 17 00:00:00 2001
From: Rudi Matz <rudi@staff.ietf.org>
Date: Fri, 27 Mar 2026 13:44:35 -0400
Subject: [PATCH 1/2] feat: add email/name for ADs and WG Chairs

---
 ietf/api/serializers_rpc.py | 28 +++++++++++++++++++++++++++-
 ietf/group/serializers.py   |  6 ++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ietf/api/serializers_rpc.py b/ietf/api/serializers_rpc.py
index 397ca05d9b..d888de4586 100644
--- a/ietf/api/serializers_rpc.py
+++ b/ietf/api/serializers_rpc.py
@@ -27,7 +27,7 @@
     update_action_holders,
     update_rfcauthors,
 )
-from ietf.group.models import Group
+from ietf.group.models import Group, Role
 from ietf.group.serializers import AreaSerializer
 from ietf.name.models import StreamName, StdLevelName
 from ietf.person.models import Person
@@ -97,6 +97,21 @@ class Meta:
         fields = ["draft_name", "authors"]
 
 
+class WgChairSerializer(serializers.Serializer):
+    """Serialize a WG chair's name and email from a Role"""
+
+    name = serializers.SerializerMethodField()
+    email = serializers.SerializerMethodField()
+
+    @extend_schema_field(serializers.CharField)
+    def get_name(self, role: Role) -> str:
+        return role.person.plain_name()
+
+    @extend_schema_field(serializers.EmailField)
+    def get_email(self, role: Role) -> str:
+        return role.email.email_address()
+
+
 class DocumentAuthorSerializer(serializers.ModelSerializer):
     """Serializer for a Person in a response"""
 
@@ -126,6 +141,7 @@ class FullDraftSerializer(serializers.ModelSerializer):
         source="shepherd.person", read_only=True
     )
     consensus = serializers.SerializerMethodField()
+    wg_chairs = serializers.SerializerMethodField()
 
     class Meta:
         model = Document
@@ -145,11 +161,21 @@ class Meta:
             "consensus",
             "shepherd",
             "ad",
+            "wg_chairs",
         ]
 
     def get_consensus(self, doc: Document) -> Optional[bool]:
         return default_consensus(doc)
 
+    @extend_schema_field(WgChairSerializer(many=True))
+    def get_wg_chairs(self, doc: Document):
+        if doc.group is None:
+            return []
+        chairs = doc.group.role_set.filter(name_id="chair").select_related(
+            "person", "email"
+        )
+        return WgChairSerializer(chairs, many=True).data
+
     def get_source_format(
         self, doc: Document
     ) -> Literal["unknown", "xml-v2", "xml-v3", "txt"]:
diff --git a/ietf/group/serializers.py b/ietf/group/serializers.py
index db3b37af48..e789ba46bf 100644
--- a/ietf/group/serializers.py
+++ b/ietf/group/serializers.py
@@ -20,8 +20,14 @@ class AreaDirectorSerializer(serializers.Serializer):
     Works with Email or Role
     """
 
+    name = serializers.SerializerMethodField()
     email = serializers.SerializerMethodField()
 
+    @extend_schema_field(serializers.CharField)
+    def get_name(self, instance: Email | Role):
+        person = getattr(instance, 'person', None)
+        return person.plain_name() if person else None
+
     @extend_schema_field(serializers.EmailField)
     def get_email(self, instance: Email | Role):
         if isinstance(instance, Role):

From b1cc7edc7ff5e80f7eb0072657e88450a4b2c06b Mon Sep 17 00:00:00 2001
From: Rudi Matz <rudi@staff.ietf.org>
Date: Fri, 27 Mar 2026 14:32:07 -0400
Subject: [PATCH 2/2] adapt test

---
 ietf/group/tests_serializers.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ietf/group/tests_serializers.py b/ietf/group/tests_serializers.py
index bf29e6c8fd..b584a17ae2 100644
--- a/ietf/group/tests_serializers.py
+++ b/ietf/group/tests_serializers.py
@@ -31,7 +31,7 @@ def test_serializes_role(self):
         serialized = AreaDirectorSerializer(role).data
         self.assertEqual(
             serialized,
-            {"email": role.email.email_address()},
+            {"email": role.email.email_address(), "name": role.person.plain_name()},
         )
 
     def test_serializes_email(self):
@@ -40,7 +40,10 @@ def test_serializes_email(self):
         serialized = AreaDirectorSerializer(email).data
         self.assertEqual(
             serialized,
-            {"email": email.email_address()},
+            {
+                "email": email.email_address(),
+                "name": email.person.plain_name() if email.person else None,
+            },
         )
 
 
@@ -63,7 +66,10 @@ def test_serializes_active_area(self):
         self.assertEqual(serialized["name"], area.name)
         self.assertCountEqual(
             serialized["ads"],
-            [{"email": ad.email.email_address()} for ad in ad_roles],
+            [
+                {"email": ad.email.email_address(), "name": ad.person.plain_name()}
+                for ad in ad_roles
+            ],
         )
 
     def test_serializes_inactive_area(self):