Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion ietf/api/serializers_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"""

Expand Down Expand Up @@ -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
Expand All @@ -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"]:
Expand Down
6 changes: 6 additions & 0 deletions ietf/group/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
12 changes: 9 additions & 3 deletions ietf/group/tests_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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,
},
)


Expand All @@ -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):
Expand Down
Loading