Working checkpoint

 - Legacy-Id: 9985

Author: rjsparks

ietf/doc/mails.py

@@ -14,6 +14,7 @@
 from ietf.person.models import Person
 from ietf.group.models import Group, Role
 from ietf.doc.models import Document
+from ietf.eventmail.utils import gather_addresses
 
 def email_state_changed(request, doc, text):
     to = [x.strip() for x in doc.notify.replace(';', ',').split(',')]
@@ -170,16 +171,13 @@ def generate_approval_mail_approved(request, doc):
     else:
         action_type = "Document"
 
-    cc = []
-    cc.extend(settings.DOC_APPROVAL_EMAIL_CC)
+    to = gather_addresses('ballot_approved_ietf_stream',doc=doc)
+    cc = gather_addresses('ballot_approved_ietf_stream_cc',doc=doc)
 
     # the second check catches some area working groups (like
     # Transport Area Working Group)
     if doc.group.type_id not in ("area", "individ", "ag") and not doc.group.name.endswith("Working Group"):
         doc.group.name_with_wg = doc.group.name + " Working Group"
-        if doc.group.list_email:
-            cc.append("%s mailing list <%s>" % (doc.group.acronym, doc.group.list_email))
-        cc.append("%s chair <%s-chairs@tools.ietf.org>" % (doc.group.acronym, doc.group.acronym))
     else:
         doc.group.name_with_wg = doc.group.name
 
@@ -206,6 +204,7 @@ def generate_approval_mail_approved(request, doc):
                             dict(doc=doc,
                                  docs=[doc],
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                                 to=",\n    ".join(to),
                                  cc=",\n    ".join(cc),
                                  doc_type=doc_type,
                                  made_by=made_by,
@@ -309,7 +308,7 @@ def email_resurrection_completed(request, doc, requester):
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
 
 def email_ballot_deferred(request, doc, by, telechat_date):
-    to = "iesg@ietf.org"
+    to = gather_addresses('ballot_deferred',doc=doc)
     frm = "DraftTracker Mail System <iesg-secretary@ietf.org>"
     send_mail(request, to, frm,
               "IESG Deferred Ballot notification: %s" % doc.file_tag(),
@@ -320,7 +319,7 @@ def email_ballot_deferred(request, doc, by, telechat_date):
                    telechat_date=telechat_date))
 
 def email_ballot_undeferred(request, doc, by, telechat_date):
-    to = "iesg@ietf.org"
+    to = gather_addresses('ballot_deferred',doc=doc)
     frm = "DraftTracker Mail System <iesg-secretary@ietf.org>"
     send_mail(request, to, frm,
               "IESG Undeferred Ballot notification: %s" % doc.file_tag(),

ietf/doc/tests_ballot.py

@@ -15,6 +15,7 @@
 from ietf.utils.mail import outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.eventmail.utils import gather_addresses
 
 
 class EditPositionTests(TestCase):
@@ -171,7 +172,7 @@ def test_send_ballot_comment(self):
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before + 2)
         m = outbox[-1]
-        self.assertEqual(m['Cc'],None)
+        self.assertEqual(m['Cc'],','.join(gather_addresses('ballot_saved_cc',doc=draft)))
 
 
 class BallotWriteupsTests(TestCase):

ietf/doc/views_ballot.py

@@ -27,6 +27,7 @@
 from ietf.name.models import BallotPositionName
 from ietf.person.models import Person
 from ietf.utils.mail import send_mail_text, send_mail_preformatted
+from ietf.eventmail.utils import gather_addresses
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -284,10 +285,13 @@ def send_ballot_comment(request, name, ballot_id):
                                  blocking_name=blocking_name,
                                  settings=settings))
     frm = ad.role_email("ad").formatted_email()
-    to = "The IESG <iesg@ietf.org>"
+    to = gather_addresses('ballot_saved',doc=doc)
 
     if request.method == 'POST':
-        cc = [x.strip() for x in request.POST.get("cc", "").split(',') if x.strip()]
+        cc = gather_addresses('ballot_saved_cc',doc=doc)
+        explicit_cc = [x.strip() for x in request.POST.get("cc", "").split(',') if x.strip()]
+        if explicit_cc: 
+            cc.extend(explicit_cc)
         if request.POST.get("cc_state_change") and doc.notify:
             cc.extend(doc.notify.split(','))
         if request.POST.get("cc_group_list") and doc.group.list_email:
@@ -712,7 +716,7 @@ def approve_ballot(request, name):
 
         if action == "to_announcement_list":
             send_mail_preformatted(request, announcement, extra=extra_automation_headers(doc),
-                                   override={ "To": "IANA <%s>"%settings.IANA_APPROVE_EMAIL, "CC": None, "Bcc": None, "Reply-To": None})
+                                   override={ "To": ",".join(gather_addresses('ballot_approved_ietf_stream_iana')), "CC": None, "Bcc": None, "Reply-To": None})
 
         msg = infer_message(announcement)
         msg.by = login

ietf/doc/views_draft.py

@@ -37,6 +37,7 @@
 from ietf.secr.lib.template import jsonapi
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.utils.textupload import get_cleaned_text_file_content
+from ietf.eventmail.utils import gather_addresses
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)
@@ -1162,7 +1163,7 @@ def request_publication(request, name):
             send_mail_message(request, m)
 
             # IANA copy
-            m.to = settings.IANA_APPROVE_EMAIL
+            m.to = ",".join(gather_addresses('ballot_approved_ietf_stream_iana'))
             send_mail_message(request, m, extra=extra_automation_headers(doc))
 
             e = DocEvent(doc=doc, type="requested_publication", by=request.user.person)

ietf/eventmail/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Ingredient',
+            fields=[
+                ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
+                ('desc', models.TextField(blank=True)),
+                ('template', models.CharField(max_length=512, null=True, blank=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Recipe',
+            fields=[
+                ('slug', models.CharField(max_length=32, serialize=False, primary_key=True)),
+                ('desc', models.TextField(blank=True)),
+                ('ingredients', models.ManyToManyField(to='eventmail.Ingredient', null=True, blank=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

ietf/eventmail/migrations/0001_initial.py

@@ -0,0 +1,155 @@
+# Copyright The IETF Trust 2015, All Rights Reserved
+
+from django.db import models
+from django.template import Template, Context
+
+class Recipe(models.Model):
+    slug = models.CharField(max_length=32, primary_key=True)
+    desc = models.TextField(blank=True)
+    ingredients = models.ManyToManyField('Ingredient', null=True, blank=True)
+
+class Ingredient(models.Model):
+    slug = models.CharField(max_length=32, primary_key=True)
+    desc = models.TextField(blank=True)
+    template = models.CharField(max_length=512, null=True, blank=True)
+
+    def gather(self, **kwargs):
+        retval = []
+        if hasattr(self,'gather_%s'%self.slug):
+            retval.extend(eval('self.gather_%s(**kwargs)'%self.slug))
+        if self.template:
+            rendering = Template(self.template).render(Context(kwargs))
+            if rendering:
+                retval.extend(rendering.split(','))
+
+        return retval
+
+    def gather_doc_group_chairs(self, **kwargs):
+        addrs = []
+        if 'doc' in kwargs:
+            doc=kwargs['doc']
+            if doc.group.type.slug in ['wg','rg']:
+                addrs.append('%s-chairs@ietf.org'%doc.group.acronym)
+        return addrs
+
+    def gather_doc_group_mail_list(self, **kwargs):
+        addrs = []
+        if 'doc' in kwargs:
+            doc=kwargs['doc']
+            if doc.group.type.slug in ['wg','rg']:
+                if doc.group.list_email:
+                    addrs.append(doc.group.list_email)
+        return addrs
+
+    def gather_doc_affecteddoc_authors(self, **kwargs):
+        addrs = []
+        if 'doc' in kwargs:
+            for reldoc in kwargs['doc'].related_that_doc(['conflrev','tohist','tois','tops']):
+                addrs.extend(Ingredient.objects.get(slug='doc_authors').gather(**{'doc':reldoc.document}))
+        return addrs
+
+    def gather_doc_affecteddoc_group_chairs(self, **kwargs):
+        addrs = []
+        if 'doc' in kwargs:
+            for reldoc in kwargs['doc'].related_that_doc(['conflrev','tohist','tois','tops']):
+                addrs.extend(Ingredient.objects.get(slug='doc_group_chairs').gather(**{'doc':reldoc.document}))
+        return addrs
+
+def make_ingredients():
+
+    Ingredient.objects.all().delete()
+    Ingredient.objects.create(slug='iesg',
+                              desc='The IESG',
+                              template='The IESG <iesg@ietf.org>')
+    Ingredient.objects.create(slug='ietf_announce',
+                              desc='The IETF Announce list',
+                              template='IETF-Announce <ietf-announce@ietf.org>')
+    Ingredient.objects.create(slug='rfc_editor',
+                              desc='The RFC Editor',
+                              template='<rfc-editor@rfc-editor.org>')
+    Ingredient.objects.create(slug='iesg_secretary',
+                              desc='The Secretariat',
+                              template='<iesg-secretary@ietf.org>')
+    Ingredient.objects.create(slug='doc_authors',
+                              desc="The document's authors",
+                              template='{{doc.name}}@ietf.org')
+    Ingredient.objects.create(slug='doc_notify',
+                              desc="The addresses in the document's notify field",
+                              template='{{doc.notify}}')
+    Ingredient.objects.create(slug='doc_group_chairs',
+                              desc="The document's group chairs (if the document is assigned to a working or research group)",
+                              template=None)
+    Ingredient.objects.create(slug='doc_affecteddoc_authors',
+                              desc="The authors of the subject documents of a conflict-review or status-change",
+                              template=None)
+    Ingredient.objects.create(slug='doc_affecteddoc_group_chairs',
+                              desc="The chairs of groups of the subject documents of a conflict-review or status-change",
+                              template=None)
+    Ingredient.objects.create(slug='doc_shepherd',
+                              desc="The document's shepherd",
+                              template='{% if doc.shepherd %}{{doc.shepherd.address}}{% endif %}' )
+    Ingredient.objects.create(slug='doc_ad',
+                              desc="The document's responsible Area Director",
+                              template='{% if doc.ad %}{{doc.ad.email_address}}{% endif %}' )
+    Ingredient.objects.create(slug='doc_group_mail_list',
+                              desc="The list address of the document's group",
+                              template=None )
+    Ingredient.objects.create(slug='conflict_review_stream_owner',
+                              desc="The stream owner of a document being reviewed for IETF stream conflicts",
+                              template='{% ifequal doc.type_id "conflrev" %}{% ifequal doc.stream_id "ise" %}<rfc-ise@rfc-editor.org>{% endifequal %}{% ifequal doc.stream_id "irtf" %}<irtf-chair@irtf.org>{% endifequal %}{% endifequal %}')
+    Ingredient.objects.create(slug='iana_approve',
+                              desc="IANA's draft approval address",
+                              template='IANA <drafts-approval@icann.org>')
+
+def make_recipes():
+    
+    Recipe.objects.all().delete()
+
+    r = Recipe.objects.create(slug='ballot_saved',
+                              desc='Recipients when a new ballot position (with discusses, other blocking positions, or comments) is saved')
+    r.ingredients = Ingredient.objects.filter(slug__in=['iesg'])
+
+    r = Recipe.objects.create(slug='ballot_saved_cc',
+                              desc='Copied when a new ballot position (with discusses, other blocking positions, or comments) is saved')
+    r.ingredients = Ingredient.objects.filter(slug__in=['doc_authors',
+                                                        'doc_group_chairs',
+                                                        'doc_shepherd',
+                                                        'doc_affecteddoc_authors',
+                                                        'doc_affecteddoc_group_chairs',
+                                                        'conflict_review_stream_owner',
+                                                        ])
+
+    r = Recipe.objects.create(slug='ballot_deferred',
+                              desc='Recipients when a ballot is deferred to or undeferred from a future telechat')
+    r.ingredients = Ingredient.objects.filter(slug__in=['iesg',
+                                                        'iesg_secretary',
+                                                        'doc_group_chairs',
+                                                        'doc_notify',
+                                                        'doc_authors',
+                                                        'doc_shepherd',
+                                                        'doc_affecteddoc_authors',
+                                                        'doc_affecteddoc_group_chairs',
+                                                        'conflict_review_stream_owner',
+                                                        ])
+
+    r = Recipe.objects.create(slug='ballot_approved_ietf_stream',
+                              desc='Recipients when an IETF stream document ballot is approved')
+    r.ingredients = Ingredient.objects.filter(slug__in=['ietf_announce'])
+
+    r = Recipe.objects.create(slug='ballot_approved_ietf_stream_cc',
+                              desc='Copied when an IETF stream document ballot is approved')
+    r.ingredients = Ingredient.objects.filter(slug__in=['iesg',
+                                                        'doc_notify',
+                                                        'doc_ad',
+                                                        'doc_authors',
+                                                        'doc_shepherd',
+                                                        'doc_group_mail_list',
+                                                        'doc_group_chairs',
+                                                        'rfc_editor',
+                                                        ])
+ 
+    r = Recipe.objects.create(slug='ballot_approved_ietf_stream_iana',
+                              desc='Recipients for IANA message when an IETF stream document ballot is approved')
+    r.ingredients = Ingredient.objects.filter(slug__in=['iana_approve'])
+
+

ietf/eventmail/migrations/__init__.py

@@ -0,0 +1,33 @@
+# Autogenerated by the makeresources management command 2015-08-06 11:00 PDT
+from tastypie.resources import ModelResource
+from tastypie.fields import ToOneField, ToManyField     # pyflakes:ignore
+from tastypie.constants import ALL, ALL_WITH_RELATIONS  # pyflakes:ignore
+
+from ietf import api
+
+from ietf.eventmail.models import *                            # pyflakes:ignore
+
+
+class IngredientResource(ModelResource):
+    class Meta:
+        queryset = Ingredient.objects.all()
+        #resource_name = 'ingredient'
+        filtering = { 
+            "slug": ALL,
+            "desc": ALL,
+            "template": ALL,
+        }
+api.eventmail.register(IngredientResource())
+
+class RecipeResource(ModelResource):
+    ingredients      = ToManyField(IngredientResource, 'ingredients', null=True)
+    class Meta:
+        queryset = Recipe.objects.all()
+        #resource_name = 'recipe'
+        filtering = { 
+            "slug": ALL,
+            "desc": ALL,
+            "ingredients": ALL_WITH_RELATIONS,
+        }
+api.eventmail.register(RecipeResource())
+

ietf/eventmail/models.py

@@ -0,0 +1,43 @@
+from django.core.urlresolvers import reverse as urlreverse
+
+from ietf.utils.test_utils import TestCase
+from ietf.utils.test_data import make_test_data
+from ietf.eventmail.models import Ingredient
+
+class EventMailTests(TestCase):
+
+    def setUp(self):
+        make_test_data()
+
+    def test_show_patterns(self):
+
+        url = urlreverse('ietf.eventmail.views.show_patterns')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue('ballot_saved_cc' in r.content)
+   
+        url = urlreverse('ietf.eventmail.views.show_patterns',kwargs=dict(eventmail_slug='ballot_saved_cc'))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue('ballot_saved_cc' in r.content)
+
+    def test_show_recipients(self):
+
+        url = urlreverse('ietf.eventmail.views.show_ingredients')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue('bogus' in r.content)
+   
+        url = urlreverse('ietf.eventmail.views.show_ingredients',kwargs=dict(ingredient_slug='bogus'))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue('bogus' in r.content)
+
+class IngredientTests(TestCase):
+
+    def test_ingredient_functions(self):
+        draft = make_test_data()
+        ingredient = Ingredient.objects.first()
+        for funcname in [name for name in dir(ingredient) if name.startswith('gather_')]:
+            func=getattr(ingredient,funcname)
+            func(**{'doc':draft,'group':draft.group})