Rename derived event models to be more self-explanatory, fixed a couple of bugs

 - Legacy-Id: 2872

Author: OleLaursen

ietf/idrfc/idrfc_wrapper.py

@@ -638,8 +638,8 @@ def _init(self):
         positions = []
         seen = {}
 
-        from doc.models import BallotPosition
-	for pos in BallotPosition.objects.filter(doc=self.ballot, type="changed_ballot_position", time__gte=self.ballot.process_start, time__lte=self.ballot.process_end).select_related('ad').order_by("-time", '-id'):
+        from doc.models import BallotPositionEvent
+	for pos in BallotPositionEvent.objects.filter(doc=self.ballot, type="changed_ballot_position", time__gte=self.ballot.process_start, time__lte=self.ballot.process_end).select_related('ad').order_by("-time", '-id'):
             if pos.ad not in seen:
                 p = dict(ad_name=pos.ad.get_name(),
                          ad_username=pos.ad.pk, # ought to rename this in doc_ballot_list
@@ -676,7 +676,7 @@ def _init(self):
             for ad in active_ads:
                 if ad not in seen:
                     d = dict(ad_name=ad.get_name(),
-                             ad_username=pos.ad.pk,
+                             ad_username=ad.pk,
                              position="No Record",
                              )
                     positions.append(d)

ietf/idrfc/mails.py

@@ -9,7 +9,7 @@
 
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.idtracker.models import *
-from doc.models import Text, BallotPosition, Expiration
+from doc.models import WriteupEvent, BallotPositionEvent, LastCallEvent
 from person.models import Email
 
 def email_state_changed(request, doc, text):
@@ -86,12 +86,12 @@ def full_intended_status(intended_status):
         return "a %s" % s
 
 def generate_ballot_writeup(request, doc):
-    e = Text()
+    e = WriteupEvent()
     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.text = unicode(render_to_string("idrfc/ballot_writeup.txt"))
     e.save()
 
     return e
@@ -158,12 +158,12 @@ def generate_last_call_announcementREDESIGN(request, doc):
                                  )
                             )
 
-    e = Text()
+    e = WriteupEvent()
     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.text = unicode(mail)
     e.save()
 
     return e
@@ -253,12 +253,12 @@ def generate_approval_mailREDESIGN(request, doc):
     else:
         mail = generate_approval_mail_approved(request, doc)
 
-    e = Text()
+    e = WriteupEvent()
     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.text = unicode(mail)
     e.save()
 
     return e
@@ -479,7 +479,7 @@ def generate_issue_ballot_mailREDESIGN(request, doc):
     active_ads = Email.objects.filter(role__name="ad", role__group__state="active")
 
     e = doc.latest_event(type="started_iesg_process")
-    positions = BallotPosition.objects.filter(doc=doc, type="changed_ballot_position", time__gte=e.time).order_by("-time", '-id').select_related('ad')
+    positions = BallotPositionEvent.objects.filter(doc=doc, type="changed_ballot_position", time__gte=e.time).order_by("-time", '-id').select_related('ad')
 
     # format positions and setup discusses and comments
     ad_feedback = []
@@ -519,14 +519,14 @@ def formatted(val):
     inactive_ad_positions.sort()
     ad_feedback.sort(key=lambda p: p.ad.get_name())
 
-    e = doc.latest_event(Expiration, type="sent_last_call")
+    e = doc.latest_event(LastCallEvent, type="sent_last_call")
     last_call_expires = e.expires if e else None
 
-    e = doc.latest_event(Text, type="changed_ballot_approval_text")
-    approval_text = e.content if e else ""
+    e = doc.latest_event(WriteupEvent, type="changed_ballot_approval_text")
+    approval_text = e.text if e else ""
 
-    e = doc.latest_event(Text, type="changed_ballot_writeup_text")
-    ballot_writeup = e.content if e else ""
+    e = doc.latest_event(WriteupEvent, type="changed_ballot_writeup_text")
+    ballot_writeup = e.text if e else ""
 
     return render_to_string("idrfc/issue_ballot_mailREDESIGN.txt",
                             dict(doc=doc,

ietf/idrfc/testsREDESIGN.py

@@ -274,30 +274,30 @@ def test_request_last_call(self):
         self.assertContains(r, "Your request to issue the Last Call")
 
         # last call text
-        e = draft.latest_event(Text, type="changed_last_call_text")
+        e = draft.latest_event(WriteupEvent, type="changed_last_call_text")
         self.assertTrue(e)
-        self.assertTrue("The IESG has received" in e.content)
-        self.assertTrue(draft.title in e.content)
-        self.assertTrue(draft.get_absolute_url() in e.content)
+        self.assertTrue("The IESG has received" in e.text)
+        self.assertTrue(draft.title in e.text)
+        self.assertTrue(draft.get_absolute_url() in e.text)
 
         # approval text
-        e = draft.latest_event(Text, type="changed_ballot_approval_text")
+        e = draft.latest_event(WriteupEvent, type="changed_ballot_approval_text")
         self.assertTrue(e)
-        self.assertTrue("The IESG has approved" in e.content)
-        self.assertTrue(draft.title in e.content)
-        self.assertTrue(draft.get_absolute_url() in e.content)
+        self.assertTrue("The IESG has approved" in e.text)
+        self.assertTrue(draft.title in e.text)
+        self.assertTrue(draft.get_absolute_url() in e.text)
 
         # ballot writeup
-        e = draft.latest_event(Text, type="changed_ballot_writeup_text")
+        e = draft.latest_event(WriteupEvent, type="changed_ballot_writeup_text")
         self.assertTrue(e)
-        self.assertTrue("Technical Summary" in e.content)
+        self.assertTrue("Technical Summary" in e.text)
 
         # mail notice
         self.assertTrue(len(mail_outbox) > mailbox_before)
         self.assertTrue("Last Call:" in mail_outbox[-1]['Subject'])
 
         # comment
-        self.assertTrue("Last call was requested" in draft.event_set.all()[0].desc)
+        self.assertTrue("Last call was requested" in draft.latest_event().desc)
 
 
 class EditInfoTestCase(django.test.TestCase):
@@ -345,7 +345,7 @@ def test_edit_info(self):
         self.assertTrue(draft.tags.filter(slug="via-rfc"))
         self.assertEquals(draft.ad, new_ad)
         self.assertEquals(draft.note, "New note")
-        self.assertTrue(not draft.latest_event(Telechat, type="telechat_date"))
+        self.assertTrue(not draft.latest_event(TelechatEvent, type="telechat_date"))
         self.assertEquals(draft.event_set.count(), events_before + 4)
         self.assertEquals(len(mail_outbox), mailbox_before + 1)
         self.assertTrue(draft.name in mail_outbox[-1]['Subject'])
@@ -367,30 +367,30 @@ def test_edit_telechat_date(self):
         from ietf.iesg.models import TelechatDates
 
         # add to telechat
-        self.assertTrue(not draft.latest_event(Telechat, "scheduled_for_telechat"))
+        self.assertTrue(not draft.latest_event(TelechatEvent, "scheduled_for_telechat"))
         data["telechat_date"] = TelechatDates.objects.all()[0].date1.isoformat()
         r = self.client.post(url, data)
         self.assertEquals(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue(draft.latest_event(Telechat, "scheduled_for_telechat"))
-        self.assertEquals(draft.latest_event(Telechat, "scheduled_for_telechat").telechat_date, TelechatDates.objects.all()[0].date1)
+        self.assertTrue(draft.latest_event(TelechatEvent, "scheduled_for_telechat"))
+        self.assertEquals(draft.latest_event(TelechatEvent, "scheduled_for_telechat").telechat_date, TelechatDates.objects.all()[0].date1)
 
         # change telechat
         data["telechat_date"] = TelechatDates.objects.all()[0].date2.isoformat()
         r = self.client.post(url, data)
         self.assertEquals(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
-        self.assertEquals(draft.latest_event(Telechat, "scheduled_for_telechat").telechat_date, TelechatDates.objects.all()[0].date2)
+        self.assertEquals(draft.latest_event(TelechatEvent, "scheduled_for_telechat").telechat_date, TelechatDates.objects.all()[0].date2)
 
         # remove from agenda
         data["telechat_date"] = ""
         r = self.client.post(url, data)
         self.assertEquals(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue(not draft.latest_event(Telechat, "scheduled_for_telechat").telechat_date)
+        self.assertTrue(not draft.latest_event(TelechatEvent, "scheduled_for_telechat").telechat_date)
 
     def test_start_iesg_process_on_draft(self):
         draft = make_test_data()
@@ -411,6 +411,7 @@ def test_start_iesg_process_on_draft(self):
         self.assertTrue('@' in q('form input[name=notify]')[0].get('value'))
 
         # add
+        events_before = draft.event_set.count()
         mailbox_before = len(mail_outbox)
 
         ad = Email.objects.get(address="aread@ietf.org")
@@ -430,9 +431,10 @@ def test_start_iesg_process_on_draft(self):
         self.assertTrue(draft.tags.filter(slug="via-rfc"))
         self.assertEquals(draft.ad, ad)
         self.assertEquals(draft.note, "This is a note")
-        self.assertTrue(not draft.latest_event(Telechat, type="scheduled_for_telechat"))
-        self.assertEquals(draft.event_set.count(), 4)
-        self.assertEquals(draft.event_set.order_by('time', '-id')[0].type, "started_iesg_process")
+        self.assertTrue(not draft.latest_event(TelechatEvent, type="scheduled_for_telechat"))
+        self.assertEquals(draft.event_set.count(), events_before + 4)
+        events = list(draft.event_set.order_by('time', 'id'))
+        self.assertEquals(events[-4].type, "started_iesg_process")
         self.assertEquals(len(mail_outbox), mailbox_before)
 
 
@@ -555,7 +557,7 @@ def test_edit_position(self):
                                        comment="This is a test."))
         self.assertEquals(r.status_code, 302)
 
-        pos = draft.latest_event(BallotPosition, ad=ad)
+        pos = draft.latest_event(BallotPositionEvent, ad=ad)
         self.assertEquals(pos.pos.slug, "discuss")
         self.assertTrue("This is a discussion test." in pos.discuss)
         self.assertTrue(pos.discuss_time != None)
@@ -569,7 +571,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="noobj"))
         self.assertEquals(r.status_code, 302)
 
-        pos = draft.latest_event(BallotPosition, ad=ad)
+        pos = draft.latest_event(BallotPositionEvent, ad=ad)
         self.assertEquals(pos.pos.slug, "noobj")
         self.assertEquals(draft.event_set.count(), events_before + 1)
         self.assertTrue("Position for" in pos.desc)
@@ -579,7 +581,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="norecord"))
         self.assertEquals(r.status_code, 302)
 
-        pos = draft.latest_event(BallotPosition, ad=ad)
+        pos = draft.latest_event(BallotPositionEvent, ad=ad)
         self.assertEquals(pos.pos.slug, "norecord")
         self.assertEquals(draft.event_set.count(), events_before + 1)
         self.assertTrue("Position for" in pos.desc)
@@ -589,7 +591,7 @@ def test_edit_position(self):
         r = self.client.post(url, dict(position="norecord", comment="New comment."))
         self.assertEquals(r.status_code, 302)
 
-        pos = draft.latest_event(BallotPosition, ad=ad)
+        pos = draft.latest_event(BallotPositionEvent, ad=ad)
         self.assertEquals(pos.pos.slug, "norecord")
         self.assertEquals(draft.event_set.count(), events_before + 2)
         self.assertTrue("Ballot comment text updated" in pos.desc)
@@ -612,7 +614,7 @@ def test_edit_position_as_secretary(self):
         r = self.client.post(url, dict(position="discuss"))
         self.assertEquals(r.status_code, 302)
 
-        pos = draft.latest_event(BallotPosition, ad=ad)
+        pos = draft.latest_event(BallotPositionEvent, ad=ad)
         self.assertEquals(pos.pos.slug, "discuss")
         self.assertTrue("New position" in pos.desc)
         self.assertTrue("by Sec" in pos.desc)
@@ -624,7 +626,7 @@ def test_send_ballot_comment(self):
 
         ad = Email.objects.get(address="aread@ietf.org")
 
-        BallotPosition.objects.create(doc=draft, type="changed_ballot_position",
+        BallotPositionEvent.objects.create(doc=draft, type="changed_ballot_position",
                                       by=ad, ad=ad, pos=BallotPositionName.objects.get(slug="yes"),
                                       comment="Test!",
                                       comment_time=datetime.datetime.now())
@@ -730,7 +732,7 @@ def test_edit_last_call_text(self):
                 save_last_call_text="1"))
         self.assertEquals(r.status_code, 200)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("This is a simple test" in draft.latest_event(Text, type="changed_last_call_text").content)
+        self.assertTrue("This is a simple test" in draft.latest_event(WriteupEvent, type="changed_last_call_text").text)
 
         # test regenerate
         r = self.client.post(url, dict(
@@ -739,7 +741,7 @@ def test_edit_last_call_text(self):
         self.assertEquals(r.status_code, 200)
         q = PyQuery(r.content)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("Subject: Last Call" in draft.latest_event(Text, type="changed_last_call_text").content)
+        self.assertTrue("Subject: Last Call" in draft.latest_event(WriteupEvent, type="changed_last_call_text").text)
 
 
     def test_request_last_call(self):
@@ -755,7 +757,7 @@ def test_request_last_call(self):
 
         # send
         r = self.client.post(url, dict(
-                last_call_text=draft.latest_event(Text, type="changed_last_call_text").content,
+                last_call_text=draft.latest_event(WriteupEvent, type="changed_last_call_text").text,
                 send_last_call_request="1"))
         draft = Document.objects.get(name=draft.name)
         self.assertEquals(draft.iesg_state_id, "lc-req")
@@ -781,7 +783,7 @@ def test_edit_ballot_writeup(self):
                 save_ballot_writeup="1"))
         self.assertEquals(r.status_code, 200)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("This is a simple test" in draft.latest_event(Text, type="changed_ballot_writeup_text").content)
+        self.assertTrue("This is a simple test" in draft.latest_event(WriteupEvent, type="changed_ballot_writeup_text").text)
 
     def test_issue_ballot(self):
         draft = make_test_data()
@@ -790,7 +792,7 @@ def test_issue_ballot(self):
 
         def create_pos(num, vote, comment="", discuss=""):
             ad = Email.objects.get(address="ad%s@ietf.org" % num)
-            e = BallotPosition()
+            e = BallotPositionEvent()
             e.doc = draft
             e.by = ad
             e.ad = ad
@@ -815,11 +817,11 @@ def create_pos(num, vote, comment="", discuss=""):
         create_pos(9, "yes")
 
         # we need approval text to be able to submit
-        e = Text()
+        e = WriteupEvent()
         e.doc = draft
         e.by = Email.objects.get(address="aread@ietf.org")
         e.type = "changed_ballot_approval_text"
-        e.content = "The document has been approved."
+        e.text = "The document has been approved."
         e.save()
 
         mailbox_before = len(mail_outbox)
@@ -859,13 +861,13 @@ def test_edit_approval_text(self):
                 save_approval_text="1"))
         self.assertEquals(r.status_code, 200)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("This is a simple test" in draft.latest_event(Text, type="changed_ballot_approval_text").content)
+        self.assertTrue("This is a simple test" in draft.latest_event(WriteupEvent, type="changed_ballot_approval_text").text)
 
         # test regenerate
         r = self.client.post(url, dict(regenerate_approval_text="1"))
         self.assertEquals(r.status_code, 200)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("Subject: Protocol Action" in draft.latest_event(Text, type="changed_ballot_approval_text").content)
+        self.assertTrue("Subject: Protocol Action" in draft.latest_event(WriteupEvent, type="changed_ballot_approval_text").text)
 
         # test regenerate when it's a disapprove
         draft.iesg_state_id = "nopubadw"
@@ -874,7 +876,7 @@ def test_edit_approval_text(self):
         r = self.client.post(url, dict(regenerate_approval_text="1"))
         self.assertEquals(r.status_code, 200)
         draft = Document.objects.get(name=draft.name)
-        self.assertTrue("NOT be published" in draft.latest_event(Text, type="changed_ballot_approval_text").content)
+        self.assertTrue("NOT be published" in draft.latest_event(WriteupEvent, type="changed_ballot_approval_text").text)
 
 class ApproveBallotTestCase(django.test.TestCase):
     fixtures = ['names']
@@ -955,7 +957,7 @@ def test_make_last_call(self):
 
         draft = Document.objects.get(name=draft.name)
         self.assertEquals(draft.iesg_state.slug, "lc")
-        self.assertEquals(draft.latest_event(Expiration, "sent_last_call").expires.strftime("%Y-%m-%d"), expire_date)
+        self.assertEquals(draft.latest_event(LastCallEvent, "sent_last_call").expires.strftime("%Y-%m-%d"), expire_date)
         self.assertEquals(len(mail_outbox), mailbox_before + 4)
 
         self.assertTrue("Last Call" in mail_outbox[-4]['Subject'])

ietf/idrfc/utils.py

@@ -3,7 +3,7 @@
 from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
 from ietf.idrfc.mails import *
 
-from doc.models import Telechat, Event
+from doc.models import Event, TelechatEvent
 
 def add_document_comment(request, doc, text, include_by=True, ballot=None):
     if request:
@@ -114,7 +114,7 @@ def update_telechat(request, idinternal, new_telechat_date, new_returning_item=N
 def update_telechatREDESIGN(request, doc, by, new_telechat_date, new_returning_item=None):
     on_agenda = bool(new_telechat_date)
 
-    prev = doc.latest_event(Telechat, type="scheduled_for_telechat")
+    prev = doc.latest_event(TelechatEvent, type="scheduled_for_telechat")
     prev_returning = bool(prev and prev.returning_item)
     prev_telechat = prev.telechat_date if prev else None
     prev_agenda = bool(prev_telechat)
@@ -135,7 +135,7 @@ def update_telechatREDESIGN(request, doc, by, new_telechat_date, new_returning_i
         and new_telechat_date != prev_telechat):
         returning = True
 
-    e = Telechat()
+    e = TelechatEvent()
     e.type = "scheduled_for_telechat"
     e.by = by
     e.doc = doc