Port change_state view + helpers + tests to new schema, retaining the old view via settings; adjusted relationship model to use source/target as attribute names

 - Legacy-Id: 2808

Author: OleLaursen

ietf/idrfc/fixtures/names.xml

@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+# boiler plate
+import os, sys
+
+one_dir_up = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../'))
+
+sys.path.insert(0, one_dir_up)
+
+from django.core.management import setup_environ
+import settings
+setup_environ(settings)
+
+# script
+from django.core.serializers import serialize
+from django.db.models import Q 
+
+def output(name, qs):
+    try:
+        f = open(os.path.join(settings.BASE_DIR, "idrfc/fixtures/%s.xml" % name), 'w')
+        f.write(serialize("xml", qs, indent=4))
+        f.close()
+    except:
+        from django.db import connection
+        from pprint import pprint
+        pprint(connection.queries)
+        raise
+
+# pick all name models directly out of the module
+names = []
+
+import name.models
+for n in dir(name.models):
+    if n[:1].upper() == n[:1] and n.endswith("Name"):
+        model = getattr(name.models, n)
+        if not model._meta.abstract:
+            names.extend(model.objects.all())
+            
+output("names", names)        
+

ietf/idrfc/generate_fixturesREDESIGN.py

@@ -2,9 +2,12 @@
 
 import datetime
 
+from django.conf import settings
+
 from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
+from doc.models import Event
 
 def request_last_call(request, doc):
     try:
@@ -15,6 +18,26 @@ def request_last_call(request, doc):
     send_last_call_request(request, doc, ballot)
     add_document_comment(request, doc, "Last Call was requested")
 
+def request_last_callREDESIGN(request, doc):
+    if not doc.latest_event(type="changed_ballot_writeup_text"):
+        generate_ballot_writeup(request, doc)
+    if not doc.latest_event(type="changed_ballot_approval_text"):
+        generate_approval_mail(request, doc)
+    if not doc.latest_event(type="changed_last_call_text"):
+        generate_last_call_announcement(request, doc)
+    
+    send_last_call_request(request, doc)
+    
+    e = Event()
+    e.type = "requested_last_call"
+    e.by = request.user.get_profile().email()
+    e.doc = doc
+    e.desc = "Last call was requested by %s" % e.by.get_name()
+    e.save()
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    request_last_call = request_last_callREDESIGN
+
 def get_expired_last_calls():
     return InternetDraft.objects.filter(lc_expiration_date__lte=datetime.date.today(),
                                         idinternal__cur_state__document_state_id=IDState.IN_LAST_CALL)

ietf/idrfc/lastcall.py

@@ -9,6 +9,8 @@
 
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.idtracker.models import *
+from doc.models import Text
+from person.models import Email
 
 def email_state_changed(request, doc, text):
     to = [x.strip() for x in doc.idinternal.state_change_notice_to.replace(';', ',').split(',')]
@@ -18,6 +20,17 @@ def email_state_changed(request, doc, text):
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.idinternal.get_absolute_url()))
 
+def email_state_changedREDESIGN(request, doc, text):
+    to = [x.strip() for x in doc.notify.replace(';', ',').split(',')]
+    send_mail(request, to, None,
+              "ID Tracker State Update Notice: %s" % doc.file_tag(),
+              "idrfc/state_changed_email.txt",
+              dict(text=text,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    email_state_changed = email_state_changedREDESIGN
+    
 def html_to_text(html):
     return strip_tags(html.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&").replace("<br>", "\n"))
 
@@ -34,6 +47,23 @@ def email_owner(request, doc, owner, changed_by, text, subject=None):
                    doc=doc,
                    url=settings.IDTRACKER_BASE_URL + doc.idinternal.get_absolute_url()))
 
+def email_ownerREDESIGN(request, doc, owner, changed_by, text, subject=None):
+    if not owner or not changed_by or owner == changed_by:
+        return
+
+    to = owner.formatted_email()
+    send_mail(request, to,
+              "DraftTracker Mail System <iesg-secretary@ietf.org>",
+              "%s updated by %s" % (doc.file_tag(), changed_by),
+              "idrfc/change_notice.txt",
+              dict(text=html_to_text(text),
+                   doc=doc,
+                   url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    email_owner = email_ownerREDESIGN
+
+
 def full_intended_status(intended_status):
     s = str(intended_status)
     # FIXME: this should perhaps be defined in the db
@@ -54,6 +84,15 @@ def full_intended_status(intended_status):
     else:
         return "a %s" % s
 
+def generate_ballot_writeup(request, doc):
+    e = Text()
+    e.type = "changed_ballot_writeup_text"
+    e.by = request.user.get_profile().email()
+    e.doc = doc
+    e.desc = u"Ballot writeup was generated by %s" % e.by.get_name()
+    e.content = unicode(render_to_string("idrfc/ballot_writeup.txt"))
+    e.save()
+    
 def generate_last_call_announcement(request, doc):
     status = full_intended_status(doc.intended_status).replace("a ", "").replace("an ", "")
 
@@ -86,6 +125,49 @@ def generate_last_call_announcement(request, doc):
                                  )
                             )
 
+def generate_last_call_announcementREDESIGN(request, doc):
+    doc.full_status = full_intended_status(doc.intended_std_level)
+    status = doc.full_status.replace("a ", "").replace("an ", "")
+    
+    expiration_date = date.today() + timedelta(days=14)
+    cc = []
+    if doc.group.type_id == "individ":
+        group = "an individual submitter"
+        expiration_date += timedelta(days=14)
+    else:
+        group = "the %s WG (%s)" % (doc.group.name, doc.group.acronym)
+        if doc.group.list_email:
+            cc.append(doc.group.list_email)
+
+    doc.filled_title = textwrap.fill(doc.title, width=70, subsequent_indent=" " * 3)
+    url = settings.IDTRACKER_BASE_URL + doc.get_absolute_url()
+    
+    mail = render_to_string("idrfc/last_call_announcement.txt",
+                            dict(doc=doc,
+                                 doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                                 expiration_date=expiration_date.strftime("%Y-%m-%d"), #.strftime("%B %-d, %Y"),
+                                 cc=", ".join("<%s>" % e for e in cc),
+                                 group=group,
+                                 docs=[doc],
+                                 urls=[url],
+                                 status=status,
+                                 impl_report="Draft" in status or "Full" in status,
+                                 )
+                            )
+    
+    from doc.models import Text
+    e = Text()
+    e.type = "changed_last_call_text"
+    e.by = request.user.get_profile().email()
+    e.doc = doc
+    e.desc = u"Last call announcement was generated by %s" % e.by.get_name()
+    e.content = unicode(mail)
+    e.save()
+    
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    generate_last_call_announcement = generate_last_call_announcementREDESIGN
+
 def generate_approval_mail(request, doc):
     if doc.idinternal.cur_state_id in IDState.DO_NOT_PUBLISH_STATES or doc.idinternal.via_rfc_editor:
         return generate_approval_mail_rfc_editor(request, doc)
@@ -114,7 +196,7 @@ def generate_approval_mail(request, doc):
         if len(docs) > 1:
             made_by = "These documents have been reviewed in the IETF but are not the products of an IETF Working Group."
         else:
-            made_by = "This document has been reviewed in the IETF but is not the product of an IETF Working Group.";
+            made_by = "This document has been reviewed in the IETF but is not the product of an IETF Working Group."
     else:
         if len(docs) > 1:
             made_by = "These documents are products of the %s." % doc.group.name_with_wg
@@ -159,6 +241,95 @@ def generate_approval_mail_rfc_editor(request, doc):
                                  )
                             )
 
+DO_NOT_PUBLISH_IESG_STATES = ("nopubadw", "nopubanw")
+
+def generate_approval_mailREDESIGN(request, doc):
+    if doc.iesg_state_id in DO_NOT_PUBLISH_IESG_STATES or doc.tags.filter(slug='via-rfc'):
+        mail = generate_approval_mail_rfc_editor(request, doc)
+    else:
+        mail = generate_approval_mail_approved(request, doc)
+
+    from doc.models import Text
+    e = Text()
+    e.type = "changed_ballot_approval_text"
+    e.by = request.user.get_profile().email()
+    e.doc = doc
+    e.desc = u"Ballot approval text was generated by %s" % e.by.get_name()
+    e.content = unicode(mail)
+    e.save()
+
+def generate_approval_mail_approved(request, doc):
+    doc.full_status = full_intended_status(doc.intended_std_level.name)
+    status = doc.full_status.replace("a ", "").replace("an ", "")
+    
+    if "an " in status:
+        action_type = "Document"
+    else:
+        action_type = "Protocol"
+    
+    cc = ["Internet Architecture Board <iab@iab.org>", "RFC Editor <rfc-editor@rfc-editor.org>"]
+
+    # the second check catches some area working groups (like
+    # Transport Area Working Group)
+    if doc.group.type_id != "area" 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
+
+    doc.filled_title = textwrap.fill(doc.title, width=70, subsequent_indent=" " * 3)
+
+    if doc.group.type_id == "individ":
+        made_by = "This document has been reviewed in the IETF but is not the product of an IETF Working Group."
+    else:
+        made_by = "This document is the product of the %s." % doc.group.name_with_wg
+    
+    director = doc.ad
+    other_director = Email.objects.filter(role__group__role__email=director, role__group__role__name="ad").exclude(pk=director.pk)
+    
+    if doc.group.type_id != "individ" and other_director:
+        contacts = "The IESG contact persons are %s and %s." % (director.get_name(), other_director[0].get_name())
+    else:
+        contacts = "The IESG contact person is %s." % director.get_name()
+
+    doc_type = "RFC" if doc.state_id == "rfc" else "Internet Draft"
+        
+    return render_to_string("idrfc/approval_mail.txt",
+                            dict(doc=doc,
+                                 docs=[doc],
+                                 doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+                                 cc=",\n    ".join(cc),
+                                 doc_type=doc_type,
+                                 made_by=made_by,
+                                 contacts=contacts,
+                                 status=status,
+                                 action_type=action_type,
+                                 )
+                            )
+
+def generate_approval_mail_rfc_editorREDESIGN(request, doc):
+    full_status = full_intended_status(doc.intended_std_level.name)
+    status = full_status.replace("a ", "").replace("an ", "")
+    disapproved = doc.iesg_state in DO_NOT_PUBLISH_IESG_STATES
+    doc_type = "RFC" if doc.state_id == "rfc" else "Internet Draft"
+    
+    return render_to_string("idrfc/approval_mail_rfc_editor.txt",
+                            dict(doc=doc,
+                                 doc_url=settings.IDTRACKER_BASE_URL + doc.idinternal.get_absolute_url(),
+                                 doc_type=doc_type,
+                                 status=status,
+                                 full_status=full_status,
+                                 disapproved=disapproved,
+                                 )
+                            )
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    generate_approval_mail = generate_approval_mailREDESIGN
+    generate_approval_mail_rfc_editor = generate_approval_mail_rfc_editorREDESIGN
+
+
 def send_last_call_request(request, doc, ballot):
     to = "iesg-secretary@ietf.org"
     frm = '"DraftTracker Mail System" <iesg-secretary@ietf.org>'
@@ -170,6 +341,19 @@ def send_last_call_request(request, doc, ballot):
               dict(docs=docs,
                    doc_url=settings.IDTRACKER_BASE_URL + doc.idinternal.get_absolute_url()))
 
+def send_last_call_requestREDESIGN(request, doc):
+    to = "iesg-secretary@ietf.org"
+    frm = '"DraftTracker Mail System" <iesg-secretary@ietf.org>'
+    
+    send_mail(request, to, frm,
+              "Last Call: %s" % doc.file_tag(),
+              "idrfc/last_call_request.txt",
+              dict(docs=[doc],
+                   doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    send_last_call_request = send_last_call_requestREDESIGN
+
 def email_resurrect_requested(request, doc, by):
     to = "I-D Administrator <internet-drafts@ietf.org>"
     frm = u"%s <%s>" % by.person.email()

ietf/idrfc/mails.py

@@ -1277,3 +1277,5 @@ def testRfcEditorQueue(self):
         self.assertEquals(len(refs), 3)
         print "OK"
 
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from testsREDESIGN import *