Automatically send the Internal Review message that the secretary currently has to send manually

 - Legacy-Id: 10063

Author: rjsparks

ietf/doc/mails.py

@@ -1,5 +1,6 @@
 # generation of mails 
 
+import os
 import textwrap, datetime
 
 from django.template.loader import render_to_string
@@ -10,7 +11,7 @@
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ipr.utils import iprs_from_docs, related_docs
 from ietf.doc.models import WriteupDocEvent, BallotPositionDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent
-from ietf.doc.utils import needed_ballot_positions
+from ietf.doc.utils import needed_ballot_positions, get_document_content
 from ietf.person.models import Person
 from ietf.group.models import Role
 from ietf.doc.models import Document
@@ -513,3 +514,25 @@ def send_review_possibly_replaces_request(request, doc):
                    possibly_replaces=doc.related_that_doc("possibly-replaces"),
                    review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })),
               cc=list(cc),)
+
+def email_charter_internal_review(request, charter):
+    addrs = gather_address_lists('charter_internal_review',doc=charter,group=charter.group)
+    filename = '%s-%s.txt' % (charter.canonical_name(),charter.rev)
+    charter_text = get_document_content(
+                        filename,
+                        os.path.join(settings.CHARTER_PATH,filename),
+                        split=False,
+                        markup=False,
+                   )
+    send_mail(request, addrs.to, settings.DEFAULT_FROM_EMAIL,
+              'Internal WG Review: %s (%s)'%(charter.group.name,charter.group.acronym),
+              'doc/mail/charter_internal_review.txt',
+              dict(charter=charter,
+                   chairs=charter.group.role_set.filter(name='chair').values_list('person__name',flat=True),
+                   ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True),
+                   charter_text=charter_text,
+                   milestones=charter.group.groupmilestone_set.filter(state="charter"),
+              ),
+              cc=addrs.cc,
+              extra={'Reply-To':"iesg@ietf.org"},
+             )

ietf/doc/tests_charter.py

@@ -78,7 +78,8 @@ def test_change_state(self):
         for slug in ("intrev", "extrev", "iesgrev"):
             s = State.objects.get(used=True, type="charter", slug=slug)
             events_before = charter.docevent_set.count()
-            mailbox_before = len(outbox)
+
+            empty_outbox()
 
             r = self.client.post(url, dict(charter_state=str(s.pk), message="test message"))
             self.assertEqual(r.status_code, 302)
@@ -96,7 +97,11 @@ def find_event(t):
             if slug in ("intrev", "iesgrev"):
                 self.assertTrue(find_event("created_ballot"))
 
-            self.assertEqual(len(outbox), mailbox_before + 2)
+            self.assertEqual(len(outbox), 3 if slug=="intrev" else 2 )
+
+            if slug=="intrev":
+                self.assertTrue("Internal WG Review" in outbox[-3]['Subject'])
+                self.assertTrue(all([x in outbox[-3]['To'] for x in ['iab@','iesg@']]))
 
             self.assertTrue("state changed" in outbox[-2]['Subject'].lower())
             self.assertTrue("iesg-secretary@" in outbox[-2]['To'])

ietf/doc/views_charter.py

@@ -20,7 +20,7 @@
 from ietf.doc.utils_charter import ( historic_milestones_for_charter,
     approved_revision, default_review_text, default_action_text,
     generate_ballot_writeup, generate_issue_ballot_mail, next_approved_revision, next_revision )
-from ietf.doc.mails import email_state_changed
+from ietf.doc.mails import email_state_changed, email_charter_internal_review
 from ietf.group.models import ChangeStateGroupEvent, MilestoneGroupEvent
 from ietf.group.utils import save_group_in_history, save_milestone_in_history, can_manage_group_type
 from ietf.ietfauth.utils import has_role, role_required
@@ -140,6 +140,9 @@ def change_state(request, name, option=None):
                 charter.time = datetime.datetime.now()
                 charter.save()
 
+                if charter_state.slug == 'intrev':
+                    email_charter_internal_review(request,charter)
+
                 if message or charter_state.slug == "intrev" or charter_state.slug == "extrev":
                     email_admin_re_charter(request, group, "Charter state changed to %s" % charter_state.name, message,'charter_state_edit_admin_needed')
 
@@ -204,9 +207,9 @@ def state_pk(slug):
 
     info_msg = {}
     if group.type_id == "wg":
-        info_msg[state_pk("infrev")] = 'The %s "%s" (%s) has been set to Informal IESG review by %s.' % (group.type.name, group.name, group.acronym, login.plain_name())
-        info_msg[state_pk("intrev")] = 'The %s "%s" (%s) has been set to Internal review by %s.\nPlease place it on the next IESG telechat and inform the IAB.' % (group.type.name, group.name, group.acronym, login.plain_name())
-        info_msg[state_pk("extrev")] = 'The %s "%s" (%s) has been set to External review by %s.\nPlease send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: ' % (group.type.name, group.name, group.acronym, login.plain_name())
+        info_msg[state_pk("infrev")] = 'The proposed charter for %s "%s" (%s) has been set to Informal IESG review by %s.' % (group.type.name, group.name, group.acronym, login.plain_name())
+        info_msg[state_pk("intrev")] = 'The proposed charter for %s "%s" (%s) has been set to Internal review by %s.\nPlease place it on the next IESG telechat if it has not already been placed.' % (group.type.name, group.name, group.acronym, login.plain_name())
+        info_msg[state_pk("extrev")] = 'The proposed charter for %s "%s" (%s) has been set to External review by %s.\nPlease send out the external review announcement to the appropriate lists.\n\nSend the announcement to other SDOs: Yes\nAdditional recipients of the announcement: ' % (group.type.name, group.name, group.acronym, login.plain_name())
 
     states_for_ballot_wo_extern = State.objects.none()
     if group.type_id == "wg":

ietf/mailtoken/migrations/0002_auto_20150809_1314.py

@@ -13,6 +13,10 @@ def make_recipients(apps):
        desc='The IESG',
        template='The IESG <iesg@ietf.org>')
 
+    rc(slug='iab',
+       desc='The IAB',
+       template='The IAB <iab@iab.org>')
+
     rc(slug='ietf_announce',
        desc='The IETF Announce list',
        template='IETF-Announce <ietf-announce@ietf.org>')
@@ -461,6 +465,7 @@ def mt_factory(slug,desc,to_slugs,cc_slugs=[]):
                          'doc_shepherd',
                          'doc_group_chairs',
                          'doc_affecteddoc_authors',
+                         'doc_group_responsible_directors',
                          'doc_affecteddoc_group_chairs',
                          'doc_affecteddoc_notify',
                         ])
@@ -793,13 +798,21 @@ def mt_factory(slug,desc,to_slugs,cc_slugs=[]):
                         ])
 
     mt_factory(slug='doc_intended_status_changed',
-               desc="Recipients for a message when a document's intended publication status changes",
+               desc="Recipients for a message when a document's intended "
+                    "publication status changes",
                to_slugs=['doc_authors',
                          'doc_group_chairs',
                          'doc_shepherd',
                          'doc_group_responsible_directors', 
                          'doc_non_ietf_stream_manager',
                         ])
+
+    mt_factory(slug='charter_internal_review',
+               desc="Recipients for message noting that internal review has "
+                     "started on a charter",
+               to_slugs=['iesg',
+                         'iab',
+                        ])
 
 def forward(apps, schema_editor):
 

ietf/name/fixtures/names.json

@@ -4511,6 +4511,14 @@
  "model": "mailtoken.recipient",
  "pk": "group_steering_group"
 },
+{
+ "fields": {
+  "template": "The IAB <iab@iab.org>",
+  "desc": "The IAB"
+ },
+ "model": "mailtoken.recipient",
+ "pk": "iab"
+},
 {
  "fields": {
   "template": "<iana@iana.org>",
@@ -4922,6 +4930,18 @@
  "model": "mailtoken.mailtoken",
  "pk": "charter_external_review"
 },
+{
+ "fields": {
+  "cc": [],
+  "to": [
+   "iab",
+   "iesg"
+  ],
+  "desc": "Recipients for message noting that internal review has started on a charter"
+ },
+ "model": "mailtoken.mailtoken",
+ "pk": "charter_internal_review"
+},
 {
  "fields": {
   "cc": [],
@@ -5116,6 +5136,7 @@
    "doc_affecteddoc_notify",
    "doc_authors",
    "doc_group_chairs",
+   "doc_group_responsible_directors",
    "doc_notify",
    "doc_shepherd"
   ],

ietf/templates/doc/mail/charter_internal_review.txt

@@ -0,0 +1,28 @@
+{% autoescape off %}{% filter wordwrap:73 %}
+
+A new IETF working group is being considered in the {{charter.group.parent.name}}. The draft charter for this working group is provided below for your review and comment.                
+
+Review time is one week.               
+
+The IETF Secretariat                
+
+{{charter.group.name}} ({{ charter.group.acronym }})               
+--------------------------------------------------                   
+Current Status: {{ charter.group.state.name }} {% if charter.group.state_id != 'bof' %}Working Group{% endif %}
+
+Chairs :        {{ chairs|join:', '|default:'TBD' }}
+
+Area Director: 	{{ ads|join:', '|default:'TBD' }}
+
+Mailing List: 	{{ charter.group.list_email|default:'TBD' }}
+
+{{ charter.name }}-{{ charter.rev }}
+
+{{ charter_text }}
+
+Proposed milestones
+
+{%if milestones %}{% for milestone in milestones reversed %}{{ milestone.due|date:"M Y" }} {{ milestone.desc }}
+{% endfor %}{% else %}TBD{% endif %}
+
+{% endfilter %}{% endautoescape%}