fix: more accurate group areas (red API) (#10462)

jennifer-richards · web-flow · commit 18902ff1be57 · 2026-02-24T13:10:42.000-04:00
* fix: RFC area only for ietf stream

* fix: no ADs for inactive areas
diff --git a/ietf/doc/serializers.py b/ietf/doc/serializers.py
@@ -229,7 +229,7 @@ class RfcMetadataSerializer(serializers.ModelSerializer):
     status = RfcStatusSerializer(source="*")
     authors = serializers.SerializerMethodField()
     group = GroupSerializer()
-    area = AreaSerializer(source="group.area", required=False)
+    area = serializers.SerializerMethodField()
     stream = StreamNameSerializer()
     ad = AreaDirectorSerializer(read_only=True, allow_null=True)
     group_list_email = serializers.EmailField(source="group.list_email", read_only=True)
@@ -287,6 +287,23 @@ def get_authors(self, doc: Document):
             many=True,
         ).data
 
+    @extend_schema_field(AreaSerializer(required=False))
+    def get_area(self, doc: Document):
+        """Get area for the RFC
+        
+        This logic might be better moved to Document or a combination of Document
+        and Group. The current (2026-02-24) Group.area() method is not strict enough:
+        it does not limit to WG groups or IETF-stream documents.
+        """
+        if doc.stream_id != "ietf":
+            return None
+        if doc.group is None:
+            return None
+        parent = doc.group.parent
+        if parent.type_id == "area":
+            return AreaSerializer(parent).data
+        return None
+
     @extend_schema_field(DocIdentifierSerializer(many=True))
     def get_identifiers(self, doc: Document):
         identifiers = []
diff --git a/ietf/group/serializers.py b/ietf/group/serializers.py
@@ -30,8 +30,15 @@ def get_email(self, instance: Email | Role):
 
 
 class AreaSerializer(serializers.ModelSerializer):
-    ads = AreaDirectorSerializer(many=True, read_only=True)
+    ads = serializers.SerializerMethodField()
 
     class Meta:
         model = Group
         fields = ["acronym", "name", "type", "ads"]
+
+    @extend_schema_field(AreaDirectorSerializer(many=True))
+    def get_ads(self, area: Group):
+        return AreaDirectorSerializer(
+            area.ads() if area.is_active else Role.objects.none(),
+            many=True,
+        ).data
