Handle the new-work message

 - Legacy-Id: 10066

Author: rjsparks

ietf/doc/tests_charter.py

@@ -9,7 +9,7 @@
 
 from ietf.doc.models import ( Document, State, BallotDocEvent, BallotType, NewRevisionDocEvent,
     TelechatDocEvent, WriteupDocEvent )
-from ietf.doc.utils_charter import next_revision, default_review_text, default_action_text
+from ietf.doc.utils_charter import next_revision, default_review_text, default_action_text 
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
@@ -273,46 +273,101 @@ def test_submit_charter(self):
             self.assertEqual(f.read(),
                               "Windows line\nMac line\nUnix line\n" + utf_8_snippet)
 
-    def test_edit_announcement_text(self):
+    def test_edit_review_announcement_text(self):
         draft = make_test_data()
         charter = draft.group.charter
 
-        for ann in ("action", "review"):
-            url = urlreverse('ietf.doc.views_charter.announcement_text', kwargs=dict(name=charter.name, ann=ann))
-            self.client.logout()
-            login_testing_unauthorized(self, "secretary", url)
+        url = urlreverse('ietf.doc.views_charter.review_announcement_text', kwargs=dict(name=charter.name))
+        self.client.logout()
+        login_testing_unauthorized(self, "secretary", url)
 
-            # normal get
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertEqual(len(q('textarea[name=announcement_text]')), 1)
-            # as Secretariat, we can send
-            if ann == "review":
-                mailbox_before = len(outbox)
-                by = Person.objects.get(user__username="secretary")
-                r = self.client.post(url, dict(
-                    announcement_text=default_review_text(draft.group, charter, by).text,
-                    send_text="1"))
-                self.assertEqual(len(outbox), mailbox_before + 1)
-                self.assertTrue('WG Review' in outbox[-1]['Subject'])
-                self.assertTrue('ietf-announce@' in outbox[-1]['To'])
-                self.assertTrue('mars-wg@' in outbox[-1]['Cc'])
-
-            # save
-            r = self.client.post(url, dict(
-                    announcement_text="This is a simple test.",
-                    save_text="1"))
-            self.assertEqual(r.status_code, 302)
-            self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_%s_announcement" % ann).text)
+        # normal get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('textarea[name=announcement_text]')), 1)
+        self.assertEqual(len(q('textarea[name=new_work_text]')), 1)
 
-            # test regenerate
-            r = self.client.post(url, dict(
-                    announcement_text="This is a simple test.",
-                    regenerate_text="1"))
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_%s_announcement" % ann).text)
+        by = Person.objects.get(user__username="secretary")
+
+        (e1, e2) = default_review_text(draft.group, charter, by)
+        announcement_text = e1.text
+        new_work_text = e2.text
+
+        empty_outbox()
+        r = self.client.post(url, dict(
+                announcement_text=announcement_text,
+                new_work_text=new_work_text,
+                send_both="1"))
+        self.assertEqual(len(outbox), 2)
+        self.assertTrue(all(['WG Review' in m['Subject'] for m in outbox]))
+        self.assertTrue('ietf-announce@' in outbox[0]['To'])
+        self.assertTrue('mars-wg@' in outbox[0]['Cc'])
+        self.assertTrue('new-work@' in outbox[1]['To'])
+
+        empty_outbox()
+        r = self.client.post(url, dict(
+                announcement_text=announcement_text,
+                new_work_text=new_work_text,
+                send_annc_only="1"))
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue('ietf-announce@' in outbox[0]['To'])
+
+        empty_outbox()
+        r = self.client.post(url, dict(
+                announcement_text=announcement_text,
+                new_work_text=new_work_text,
+                send_nw_only="1"))
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue('new-work@' in outbox[0]['To'])
+
+        # save
+        r = self.client.post(url, dict(
+                announcement_text="This is a simple test.",
+                new_work_text="New work gets something different.",
+                save_text="1"))
+        self.assertEqual(r.status_code, 302)
+        self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_review_announcement").text)
+        self.assertTrue("New work gets something different." in charter.latest_event(WriteupDocEvent, type="changed_new_work_text").text)
+
+        # test regenerate
+        r = self.client.post(url, dict(
+                announcement_text="This is a simple test.",
+                new_work_text="Too simple perhaps?",
+                regenerate_text="1"))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_review_announcement").text)
+        self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_new_work_text").text)
+
+    def test_edit_action_announcement_text(self):
+        draft = make_test_data()
+        charter = draft.group.charter
+
+        url = urlreverse('ietf.doc.views_charter.action_announcement_text', kwargs=dict(name=charter.name))
+        self.client.logout()
+        login_testing_unauthorized(self, "secretary", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('textarea[name=announcement_text]')), 1)
+
+        # save
+        r = self.client.post(url, dict(
+                announcement_text="This is a simple test.",
+                save_text="1"))
+        self.assertEqual(r.status_code, 302)
+        self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_action_announcement").text)
+
+        # test regenerate
+        r = self.client.post(url, dict(
+                announcement_text="This is a simple test.",
+                regenerate_text="1"))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_action_announcement").text)
 
     def test_edit_ballot_writeupnotes(self):
         draft = make_test_data()

ietf/doc/urls_charter.py

@@ -9,7 +9,8 @@
     url(r'^telechat/$', "ietf.doc.views_doc.telechat_date", name='charter_telechat_date'),
     url(r'^notify/$', "ietf.doc.views_doc.edit_notify", name='charter_edit_notify'),
     url(r'^ad/$', "ietf.doc.views_charter.edit_ad", name='charter_edit_ad'),
-    url(r'^(?P<ann>action|review)/$', "ietf.doc.views_charter.announcement_text", name="charter_edit_announcement"),
+    url(r'^action/$', "ietf.doc.views_charter.action_announcement_text"),
+    url(r'^review/$', "ietf.doc.views_charter.review_announcement_text"),
     url(r'^ballotwriteupnotes/$', "ietf.doc.views_charter.ballot_writeupnotes"),
     url(r'^approve/$', "ietf.doc.views_charter.approve", name='charter_approve'),
     url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', "ietf.doc.views_charter.submit", name='charter_submit'),

ietf/doc/utils_charter.py

@@ -6,6 +6,7 @@
 from ietf.doc.models import NewRevisionDocEvent, WriteupDocEvent, BallotPositionDocEvent
 from ietf.person.models import Person
 from ietf.utils.history import find_history_active_at
+from ietf.utils.mail import parse_preformatted
 from ietf.mailtoken.utils import gather_address_lists
 
 def charter_name_for_group(group):
@@ -120,28 +121,51 @@ def default_action_text(group, charter, by):
     e.save()
     return e
 
+def derive_new_work_text(review_text,group):
+    addrs= gather_address_lists('charter_external_review_new_work',group=group).as_strings()
+    (m,_,_) = parse_preformatted(review_text,
+                                 override={'To':addrs.to,
+                                           'Cc':addrs.cc,
+                                           'From':'The IESG <iesg@ietf.org>',
+                                           'Reply_to':'<iesg@ietf.org>'})
+    if not addrs.cc:
+        del m['Cc']
+    return m.as_string()
+
 def default_review_text(group, charter, by):
+    now = datetime.datetime.now()
     addrs=gather_address_lists('charter_external_review',group=group).as_strings(compact=False)
-    e = WriteupDocEvent(doc=charter, by=by)
-    e.by = by
-    e.type = "changed_review_announcement"
-    e.desc = "%s review text was changed" % group.type.name
-    e.text = render_to_string("doc/charter/review_text.txt",
+
+    e1 = WriteupDocEvent(doc=charter, by=by)
+    e1.by = by
+    e1.type = "changed_review_announcement"
+    e1.desc = "%s review text was changed" % group.type.name
+    e1.text = render_to_string("doc/charter/review_text.txt",
                               dict(group=group,
-                                   charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
-                                   charter_text=read_charter_text(charter),
-                                   chairs=group.role_set.filter(name="chair"),
-                                   secr=group.role_set.filter(name="secr"),
-                                   techadv=group.role_set.filter(name="techadv"),
-                                   milestones=group.groupmilestone_set.filter(state="charter"),
-                                   review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
-                                   review_type="new" if group.state_id == "proposed" else "recharter",
-                                   to=addrs.to,
-                                   cc=addrs.cc,
+                                    charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
+                                    charter_text=read_charter_text(charter),
+                                    chairs=group.role_set.filter(name="chair"),
+                                    secr=group.role_set.filter(name="secr"),
+                                    techadv=group.role_set.filter(name="techadv"),
+                                    milestones=group.groupmilestone_set.filter(state="charter"),
+                                    review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
+                                    review_type="new" if group.state_id == "proposed" else "recharter",
+                                    to=addrs.to,
+                                    cc=addrs.cc,
                                    )
                               )
-    e.save()
-    return e
+    e1.time = now
+    e1.save()
+    
+    e2 = WriteupDocEvent(doc=charter, by=by)
+    e2.by = by
+    e2.type = "changed_new_work_text"
+    e2.desc = "%s review text was changed" % group.type.name
+    e2.text = derive_new_work_text(e1.text,group)
+    e2.time = now
+    e2.save()
+
+    return (e1,e2)
 
 def generate_issue_ballot_mail(request, doc, ballot):
     active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active", email__role__group__type="area").distinct()