Merged in [18798] from jennifer@painless-security.com:

    Improve handling of submissions for closed working groups. Fixes ietf-tools#3058.
 - Legacy-Id: 18807
Note: SVN reference [18798] has been migrated to Git commit 233bff8

Author: rjsparks

ietf/group/models.py

@@ -49,6 +49,8 @@ class GroupInfo(models.Model):
 
     uses_milestone_dates = models.BooleanField(default=True)
 
+    ACTIVE_STATE_IDS = ('active', 'bof', 'proposed')  # states considered "active"
+    
     def __str__(self):
         return self.name
 
@@ -72,12 +74,39 @@ def about_url(self):
     def is_bof(self):
         return self.state_id in ["bof", "bof-conc"]
 
+    @property
+    def is_wg(self):
+        return self.type_id == 'wg'
+
+    @property
+    def is_active(self):
+        # N.B., this has only been thought about for groups of type WG!
+        return self.state_id in self.ACTIVE_STATE_IDS
+
+    @property
+    def is_individual(self):
+        return self.acronym == 'none'
+
+    @property
+    def area(self):
+        if self.type_id == 'area':
+            return self
+        elif not self.is_individual and self.parent:
+            return self.parent
+        return None
+
     class Meta:
         abstract = True
 
 class GroupManager(models.Manager):
+    def wgs(self):
+        return self.get_queryset().filter(type='wg')
+
     def active_wgs(self):
-        return self.get_queryset().filter(type='wg', state__in=('bof','proposed','active'))
+        return self.wgs().filter(state__in=Group.ACTIVE_STATE_IDS)
+
+    def closed_wgs(self):
+        return self.wgs().exclude(state__in=Group.ACTIVE_STATE_IDS)
 
 class Group(GroupInfo):
     objects = GroupManager()
@@ -114,6 +143,13 @@ def get_chair(self):
         chair = self.role_set.filter(name__slug='chair')[:1]
         return chair and chair[0] or None
 
+    @property
+    def ads(self):
+        return sorted(
+            self.role_set.filter(name="ad").select_related("email", "person"),
+            key=lambda role: role.person.name_parts()[3],  # gets last name
+        )
+
     # these are copied to Group because it is still proxied.
     @property
     def upcase_acronym(self):

ietf/group/views.py

@@ -221,7 +221,6 @@ def wg_summary_area(request, group_type):
         raise Http404
     areas = Group.objects.filter(type="area", state="active").order_by("name")
     for area in areas:
-        area.ads = sorted(roles(area, "ad"), key=extract_last_name)
         area.groups = Group.objects.filter(parent=area, type="wg", state="active").order_by("acronym")
         for group in area.groups:
             group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
@@ -250,13 +249,11 @@ def wg_charters(request, group_type):
         raise Http404
     areas = Group.objects.filter(type="area", state="active").order_by("name")
     for area in areas:
-        area.ads = sorted(roles(area, "ad"), key=extract_last_name)
         area.groups = Group.objects.filter(parent=area, type="wg", state="active").order_by("name")
         for group in area.groups:
             fill_in_charter_info(group)
             fill_in_wg_roles(group)
             fill_in_wg_drafts(group)
-            group.area = area
     return render(request, 'group/1wg-charters.txt',
                   { 'areas': areas },
                   content_type='text/plain; charset=UTF-8')
@@ -265,17 +262,12 @@ def wg_charters(request, group_type):
 def wg_charters_by_acronym(request, group_type):
     if group_type != "wg":
         raise Http404
-    areas = dict((a.id, a) for a in Group.objects.filter(type="area", state="active").order_by("name"))
-
-    for area in areas.values():
-        area.ads = sorted(roles(area, "ad"), key=extract_last_name)
 
     groups = Group.objects.filter(type="wg", state="active").exclude(parent=None).order_by("acronym")
     for group in groups:
         fill_in_charter_info(group)
         fill_in_wg_roles(group)
         fill_in_wg_drafts(group)
-        group.area = areas.get(group.parent_id)
     return render(request, 'group/1wg-charters-by-acronym.txt',
                   { 'groups': groups },
                   content_type='text/plain; charset=UTF-8')
@@ -313,15 +305,13 @@ def active_dirs(request):
     dirs = Group.objects.filter(type__in=['dir', 'review'], state="active").order_by("name")
     for group in dirs:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-        group.ads = sorted(roles(group, "ad"), key=extract_last_name)
         group.secretaries = sorted(roles(group, "secr"), key=extract_last_name)
     return render(request, 'group/active_dirs.html', {'dirs' : dirs })
 
 def active_review_dirs(request):
     dirs = Group.objects.filter(type="review", state="active").order_by("name")
     for group in dirs:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-        group.ads = sorted(roles(group, "ad"), key=extract_last_name)
         group.secretaries = sorted(roles(group, "secr"), key=extract_last_name)
     return render(request, 'group/active_review_dirs.html', {'dirs' : dirs })
 
@@ -345,14 +335,15 @@ def active_wgs(request):
     areas = Group.objects.filter(type="area", state="active").order_by("name")
     for area in areas:
         # dig out information for template
-        area.ads = (list(sorted(roles(area, "ad"), key=extract_last_name))
-                    + list(sorted(roles(area, "pre-ad"), key=extract_last_name)))
+        area.ads_and_pre_ads = (
+            list(area.ads) + list(sorted(roles(area, "pre-ad"), key=extract_last_name))
+        )
 
         area.groups = Group.objects.filter(parent=area, type="wg", state="active").order_by("acronym")
         area.urls = area.groupextresource_set.all().order_by("name")
         for group in area.groups:
             group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-            group.ad_out_of_area = group.ad_role() and group.ad_role().person not in [role.person for role in area.ads]
+            group.ad_out_of_area = group.ad_role() and group.ad_role().person not in [role.person for role in area.ads_and_pre_ads]
             # get the url for mailing list subscription
             if group.list_subscribe.startswith('http'):
                 group.list_subscribe_url = group.list_subscribe
@@ -378,7 +369,6 @@ def active_ags(request):
     groups = Group.objects.filter(type="ag", state="active").order_by("acronym")
     for group in groups:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-        group.ads = sorted(roles(group, "ad"), key=extract_last_name)
 
     return render(request, 'group/active_ags.html', { 'groups': groups })
 

ietf/mailtrigger/migrations/0020_add_ad_approval_request_mailtriggers.py

@@ -0,0 +1,58 @@
+# Generated by Django 2.2.17 on 2020-11-23 09:54
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    """Add new MailTrigger and Recipients, remove the one being replaced"""
+    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
+    Recipient = apps.get_model('mailtrigger', 'Recipient')
+
+    MailTrigger.objects.create(
+        slug='sub_director_approval_requested',
+        desc='Recipients for a message requesting AD approval of a revised draft submission',
+    ).to.add(
+        Recipient.objects.create(
+            pk='sub_group_parent_directors',
+            desc="ADs for the parent group of a submission"
+        )
+    )
+
+    MailTrigger.objects.create(
+        slug='sub_replaced_doc_chair_approval_requested',
+        desc='Recipients for a message requesting chair approval of a replaced WG document',
+    ).to.add(
+        Recipient.objects.get(pk='doc_group_chairs')
+    )
+
+    MailTrigger.objects.create(
+        slug='sub_replaced_doc_director_approval_requested',
+        desc='Recipients for a message requesting AD approval of a replaced WG document',
+    ).to.add(
+        Recipient.objects.create(
+            pk='doc_group_parent_directors',
+            desc='ADs for the parent group of a doc'
+        )
+    )
+
+
+def reverse(apps, schema_editor):
+    """Remove the MailTrigger and Recipient created in the forward migration"""
+    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
+    MailTrigger.objects.filter(slug='sub_director_approval_requested').delete()
+    MailTrigger.objects.filter(slug='sub_replaced_doc_chair_approval_requested').delete()
+    MailTrigger.objects.filter(slug='sub_replaced_doc_director_approval_requested').delete()
+    Recipient = apps.get_model('mailtrigger', 'Recipient')
+    Recipient.objects.filter(pk='sub_group_parent_directors').delete()
+    Recipient.objects.filter(pk='doc_group_parent_directors').delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0019_email_iana_expert_review_state_changed'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/mailtrigger/models.py

@@ -242,6 +242,27 @@ def gather_submission_group_chairs(self, **kwargs):
                 addrs.extend(Recipient.objects.get(slug='group_chairs').gather(**{'group':submission.group}))
         return addrs
 
+    def gather_sub_group_parent_directors(self, **kwargs):
+        addrs = []
+        if 'submission' in kwargs:
+            submission = kwargs['submission']
+            if submission.group and submission.group.parent:
+                addrs.extend(
+                    Recipient.objects.get(
+                        slug='group_responsible_directors').gather(group=submission.group.parent)
+                )
+        return addrs
+
+    def gather_doc_group_parent_directors(self, **kwargs):
+        addrs = []
+        doc = kwargs.get('doc')
+        if doc and doc.group and doc.group.parent:
+            addrs.extend(
+                Recipient.objects.get(
+                    slug='group_responsible_directors').gather(group=doc.group.parent)
+            )
+        return addrs
+
     def gather_submission_confirmers(self, **kwargs):
         """If a submitted document is revising an existing document, the confirmers 
            are the authors of that existing document, and the chairs if the document is

ietf/name/fixtures/names.json

@@ -4890,6 +4890,17 @@
     "model": "mailtrigger.mailtrigger",
     "pk": "sub_confirmation_requested"
   },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients for a message requesting AD approval of a revised draft submission",
+      "to": [
+        "sub_group_parent_directors"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "sub_director_approval_requested"
+  },
   {
     "fields": {
       "cc": [],
@@ -4942,6 +4953,28 @@
     "model": "mailtrigger.mailtrigger",
     "pk": "sub_new_wg_00"
   },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients for a message requesting chair approval of a replaced WG document",
+      "to": [
+        "doc_group_chairs"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "sub_replaced_doc_chair_approval_requested"
+  },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients for a message requesting AD approval of a replaced WG document",
+      "to": [
+        "doc_group_parent_directors"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "sub_replaced_doc_director_approval_requested"
+  },
   {
     "fields": {
       "desc": "The person providing a comment to nomcom",
@@ -5046,6 +5079,14 @@
     "model": "mailtrigger.recipient",
     "pk": "doc_group_mail_list"
   },
+  {
+    "fields": {
+      "desc": "ADs for the parent group of a doc",
+      "template": null
+    },
+    "model": "mailtrigger.recipient",
+    "pk": "doc_group_parent_directors"
+  },
   {
     "fields": {
       "desc": "The document's group's responsible AD(s) or IRTF chair",
@@ -5534,6 +5575,14 @@
     "model": "mailtrigger.recipient",
     "pk": "stream_managers"
   },
+  {
+    "fields": {
+      "desc": "ADs for the parent group of a submission",
+      "template": null
+    },
+    "model": "mailtrigger.recipient",
+    "pk": "sub_group_parent_directors"
+  },
   {
     "fields": {
       "desc": "The authors of a submitted draft",
@@ -9702,6 +9751,20 @@
     "model": "name.docurltagname",
     "pk": "yang-module-metadata"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Awaiting AD Approval",
+      "next_states": [
+        "cancel",
+        "posted"
+      ],
+      "order": 5,
+      "used": true
+    },
+    "model": "name.draftsubmissionstatename",
+    "pk": "ad-appr"
+  },
   {
     "fields": {
       "desc": "",
@@ -9737,7 +9800,7 @@
       "desc": "",
       "name": "Cancelled",
       "next_states": [],
-      "order": 6,
+      "order": 7,
       "used": true
     },
     "model": "name.draftsubmissionstatename",
@@ -9779,7 +9842,7 @@
         "cancel",
         "posted"
       ],
-      "order": 5,
+      "order": 6,
       "used": true
     },
     "model": "name.draftsubmissionstatename",
@@ -9790,7 +9853,7 @@
       "desc": "",
       "name": "Posted",
       "next_states": [],
-      "order": 7,
+      "order": 8,
       "used": true
     },
     "model": "name.draftsubmissionstatename",
@@ -9821,7 +9884,7 @@
         "cancel",
         "posted"
       ],
-      "order": 8,
+      "order": 9,
       "used": true
     },
     "model": "name.draftsubmissionstatename",