checkpoint

 - Legacy-Id: 10019

Author: rjsparks

ietf/doc/expire.py

@@ -7,9 +7,10 @@
 
 from ietf.utils.mail import send_mail
 from ietf.doc.models import Document, DocEvent, State, save_document_in_history, IESG_SUBSTATE_TAGS
-from ietf.person.models import Person, Email
+from ietf.person.models import Person 
 from ietf.meeting.models import Meeting
 from ietf.doc.utils import add_state_change_event
+from ietf.mailtoken.utils import gather_address_list
 
 
 
@@ -70,10 +71,8 @@ def send_expire_warning_for_draft(doc):
 
     expiration = doc.expires.date()
 
-    to = [e.formatted_email() for e in doc.authors.all() if not e.address.startswith("unknown-email")]
-    cc = None
-    if doc.group.type_id in ("wg", "rg"):
-        cc = [e.formatted_email() for e in Email.objects.filter(role__group=doc.group, role__name="chair") if not e.address.startswith("unknown-email")]
+    to = gather_address_list('doc_expires_soon',doc=doc)
+    cc = gather_address_list('doc_expires_soon_cc',doc=doc)
 
     s = doc.get_state("draft-iesg")
     state = s.name if s else "I-D Exists"
@@ -91,21 +90,23 @@ def send_expire_warning_for_draft(doc):
                   cc=cc)
 
 def send_expire_notice_for_draft(doc):
-    if not doc.ad or doc.get_state_slug("draft-iesg") == "dead":
+    if doc.get_state_slug("draft-iesg") == "dead":
         return
 
     s = doc.get_state("draft-iesg")
     state = s.name if s else "I-D Exists"
 
     request = None
-    to = doc.ad.role_email("ad").formatted_email()
+    to = gather_address_list('doc_expired',doc=doc)
+    cc = gather_address_list('doc_expired_cc',doc=doc)
     send_mail(request, to,
               "I-D Expiring System <ietf-secretariat-reply@ietf.org>",
               u"I-D was expired %s" % doc.file_tag(),
               "doc/draft/id_expired_email.txt",
               dict(doc=doc,
                    state=state,
-                   ))
+                   ),
+              cc=cc)
 
 def move_draft_files_to_archive(doc, rev):
     def move_file(f):

ietf/doc/mails.py

@@ -261,7 +261,7 @@ def send_last_call_request(request, doc):
               cc=cc)
 
 def email_resurrect_requested(request, doc, by):
-    to = "I-D Administrator <internet-drafts@ietf.org>"
+    to = gather_address_list('resurrection_requested',doc=doc)
 
     if by.role_set.filter(name="secr", group__acronym="secretariat"):
         e = by.role_email("secr", group="secretariat")
@@ -277,12 +277,7 @@ def email_resurrect_requested(request, doc, by):
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
 
 def email_resurrection_completed(request, doc, requester):
-    if requester.role_set.filter(name="secr", group__acronym="secretariat"):
-        e = requester.role_email("secr", group="secretariat")
-    else:
-        e = requester.role_email("ad")
-
-    to = e.formatted_email()
+    to = gather_address_list('resurrection_completed',doc=doc)
     frm = "I-D Administrator <internet-drafts-reply@ietf.org>"
     send_mail(request, to, frm,
               "I-D Resurrection Completed - %s" % doc.file_tag(),

ietf/doc/tests_draft.py

@@ -524,7 +524,7 @@ def test_warn_expirable_drafts(self):
 
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("aread@ietf.org" in str(outbox[-1])) # author
-        self.assertTrue("marschairman@ietf.org" in str(outbox[-1]))
+        self.assertTrue("mars-chairs@ietf.org" in str(outbox[-1]))
 
     def test_expire_drafts(self):
         from ietf.doc.expire import get_expired_drafts, send_expire_notice_for_draft, expire_draft

ietf/group/mails.py

@@ -15,7 +15,7 @@
 from ietf.mailtoken.utils import gather_address_list
 
 def email_iesg_secretary_re_charter(request, group, subject, text):
-    to = ["iesg-secretary@ietf.org"]
+    to = gather_address_list('charter_state_message_provided',group=group)
     full_subject = u"Regarding %s %s: %s" % (group.type.name, group.acronym, subject)
     text = strip_tags(text)
 

ietf/mailtoken/migrations/0002_auto_20150809_1314.py

@@ -117,6 +117,42 @@ def make_recipients(apps):
        desc="The document's group's responsible AD(s) or IRTF chair",
        template=None)
 
+    rc(slug='internet_drafts',
+       desc="The internet drafts ticketing system",
+       template='internet-drafts@ietf.org')
+
+    rc(slug='submission_submitter',
+       desc="The person that submitted a draft",
+       template='{{submission.submitter}}')
+
+    rc(slug='submission_authors',
+       desc="The authors of a submitted draft",
+       template=None)
+
+    rc(slug='submission_group_chairs',
+       desc="The chairs of a submitted draft belonging to a group",
+       template=None)
+
+    rc(slug='submission_confirmers',
+       desc="The people who can confirm a draft submission",
+       template=None)
+
+    rc(slug='submission_group_mail_list',
+       desc="The people who can confirm a draft submission",
+       template=None)
+
+    rc(slug='doc_non_ietf_stream_manager',
+       desc="The document's stream manager if the document is not in the IETF stream",
+       template=None)
+
+    rc(slug='rfc_editor_if_doc_in_queue',
+       desc="The RFC Editor if a document is in the RFC Editor queue",
+       template=None)
+
+    rc(slug='doc_discussing_ads',
+       desc="Any ADs holding an active DISCUSS position on a given document",
+       template=None)
+
 def make_mailtokens(apps):
 
     Recipient=apps.get_model('mailtoken','Recipient')
@@ -393,6 +429,94 @@ def mt_factory(slug,desc,recipient_slugs):
                                 'doc_group_responsible_directors',
                                ]) 
 
+    mt_factory(slug='charter_state_message_provided',
+               desc="Recipients for extra message when provided on the charter state editing form",
+               recipient_slugs=['iesg_secretary'])
+
+    mt_factory(slug='doc_expires_soon',
+               desc="Recipients for notification of impending expiration of a document",
+               recipient_slugs=['doc_authors'])
+
+    mt_factory(slug='doc_expires_soon_cc',
+               desc="Copied on  notification of impending expiration of a document",
+               recipient_slugs=['doc_notify',
+                                'doc_shepherd',
+                                'doc_group_chairs',
+                                'doc_group_responsible_directors',
+                               ])
+
+    mt_factory(slug='doc_expired',
+               desc="Recipients for notification of a document's expiration",
+               recipient_slugs=['doc_authors'])
+
+    mt_factory(slug='doc_expired_cc',
+               desc="Copied on notification of a document's expiration",
+               recipient_slugs=['doc_notify',
+                                'doc_shepherd',
+                                'doc_group_chairs',
+                                'doc_group_responsible_directors',
+                               ])
+
+    mt_factory(slug='resurrection_requested',
+               desc="Recipients of a request to change the state of a draft away from 'Dead'",
+               recipient_slugs=['internet_drafts',])
+
+    mt_factory(slug='resurrection_completed',
+               desc="Recipients when a draft resurrection request has been completed",
+               recipient_slugs=['iesg_secretary',
+                                'doc_ad',
+                               ])
+
+    mt_factory(slug='sub_manual_post_requested',
+               desc="Recipients for a manual post request for a draft submission",
+               recipient_slugs=['internet_drafts',
+                               ])
+
+    mt_factory(slug='sub_manual_post_requested_cc',
+               desc="Copied on a manual post request for a draft submission",
+               recipient_slugs=['submission_submitter',
+                                'submission_authors',
+                                'submission_group_chairs',
+                               ])
+
+    mt_factory(slug='sub_chair_approval_requested',
+               desc="Recipients for a message requesting group chair approval of a draft submission",
+               recipient_slugs=['submission_group_chairs',])
+
+    mt_factory(slug='sub_confirmation_requested',
+               desc="Recipients for a message requesting confirmation of a draft submission",
+               recipient_slugs=['submission_confirmers',])
+
+    mt_factory(slug='sub_management_url_requested',
+               desc="Recipients for a message with the full URL for managing a draft submission",
+               recipient_slugs=['submission_confirmers',])
+
+    mt_factory(slug='sub_announced',
+               desc="Recipients for the announcement of a successfully submitted draft",
+               recipient_slugs=['ietf_announce',
+                               ])
+
+    mt_factory(slug='sub_announced_cc',
+               desc="Copied on the announcement of a successfully submitted draft",
+               recipient_slugs=['submission_group_mail_list',
+                               ])
+
+    mt_factory(slug='sub_announced_to_authors',
+               desc="Recipients for the announcement to the authors of a successfully submitted draft",
+               recipient_slugs=['submission_authors',
+                                'submission_confirmers',
+                               ])
+
+    mt_factory(slug='sub_new_version',
+               desc="Recipient for notification of a new version of an existing document",
+               recipient_slugs=['doc_notify',
+                                'doc_ad',
+                                'non_ietf_stream_manager',
+                                'rfc_editor_if_doc_in_queue',
+                                'doc_discussing_ads',
+                               ])
+
+
 def forward(apps, schema_editor):
 
     make_recipients(apps)

ietf/mailtoken/models.py

@@ -3,8 +3,6 @@
 from django.db import models
 from django.template import Template, Context
 
-from ietf.group.models import Role
-
 class MailToken(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
@@ -52,7 +50,7 @@ def gather_doc_group_delegates(self, **kwargs):
         if 'doc' in kwargs:
             doc=kwargs['doc']
             if doc.group and doc.group.type.slug in ['wg','rg']:
-                addrs.extend(Role.objects.filter(group=doc.group,name='delegate').values_list('email__address',flat=True))
+                addrs.extend(doc.group.role_set.filter(name='delegate').values_list('email__address',flat=True))
         return addrs
 
     def gather_doc_group_mail_list(self, **kwargs):
@@ -125,11 +123,19 @@ def gather_doc_stream_manager(self, **kwargs):
             addrs.extend(Recipient.objects.get(slug='stream_managers').gather(**{'streams':[kwargs['doc'].stream_id]}))
         return addrs
 
+    def gather_doc_non_ietf_stream_manager(self, **kwargs):
+        addrs = []
+        if 'doc' in kwargs:
+            doc = kwargs['doc']
+            if doc.stream_id and doc.stream_id != 'ietf':
+                addrs.extend(Recipient.objects.get(slug='stream_managers').gather(**{'streams':[doc.stream_id,]}))
+        return addrs
+
     def gather_group_responsible_directors(self, **kwargs):
         addrs = []
         if 'group' in kwargs:
             group = kwargs['group']
-            addrs.extend(Role.objects.filter(group=group,name='ad').values_list('email__address',flat=True))
+            addrs.extend(group.role_set.filter(name='ad').values_list('email__address',flat=True))
             if group.type_id=='rg':
                 addrs.extend(Recipient.objects.get(slug='stream_managers').gather(**{'streams':['irtf']}))
         return addrs
@@ -141,3 +147,62 @@ def gather_doc_group_responsible_directors(self, **kwargs):
             if group:
                 addrs.extend(Recipient.objects.get(slug='group_responsible_directors').gather(**{'group':group}))
         return addrs
+
+    def gather_submission_authors(self, **kwargs):
+        addrs = []
+        if 'submission' in kwargs:
+            submission = kwargs['submission']
+            addrs.extend(["%s <%s>" % (author["name"], author["email"]) for author in submission.authors_parsed() if author["email"]]) 
+        return addrs
+
+    def gather_submission_group_chairs(self, **kwargs):
+        addrs = []
+        if 'submission' in kwargs:
+            submission = kwargs['submission']
+            if submission.group: 
+                addrs.extend(Recipient.objects.get(slug='group_chairs').gather(**{'group':submission.group}))
+        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. Otherwise, the confirmers
+           are the authors and submitter of the submitted document."""
+
+        addrs=[]
+        if 'submission' in kwargs:
+            submission = kwargs['submission']
+            doc=submission.existing_document()
+            if doc:
+                addrs.extend([i.author.formatted_email() for i in doc.documentauthor_set.all() if not i.author.invalid_address()])
+            else:
+                addrs.extend([u"%s <%s>" % (author["name"], author["email"]) for author in submission.authors_parsed() if author["email"]])
+                if submission.submitter_parsed()["email"]: 
+                    addrs.append(submission.submitter)
+        return addrs
+
+    def gather_submission_group_mail_list(self, **kwargs):
+        addrs=[]
+        if 'submission' in kwargs:
+            submission = kwargs['submission']
+            if submission.group:  
+                addrs.extend(Recipient.objects.get(slug='group_mail_list').gather(**{'group':submission.group}))
+        return addrs
+
+    def gather_rfc_editor_if_doc_in_queue(self, **kwargs):
+        addrs=[]
+        if 'doc' in kwargs:
+            doc = kwargs['doc']
+            if doc.get_state_slug("draft-rfceditor") is not None:
+                addrs.extend(Recipient.objects.get(slug='rfc_editor').gather(**{}))
+        return addrs
+
+    def gather_doc_discussing_ads(self, **kwargs):
+        addrs=[]
+        if 'doc' in kwargs:
+            doc = kwargs['doc']
+            active_ballot = doc.active_ballot()
+            if active_ballot:
+                for ad, pos in active_ballot.active_ad_positions().iteritems():
+                    if pos and pos.pos_id == "discuss":
+                        addrs.append(ad.role_email("ad").address)
+        return addrs