Rename Event to DocEvent to avoid confusion

 - Legacy-Id: 3178

Author: OleLaursen

ietf/idrfc/expire.py

@@ -9,7 +9,7 @@
 from ietf.idtracker.models import InternetDraft, IDDates, IDStatus, IDState, DocumentComment, IDAuthor,WGChair
 from ietf.utils.mail import send_mail, send_mail_subj
 from ietf.idrfc.utils import log_state_changed, add_document_comment
-from doc.models import Document, Event, save_document_in_history
+from doc.models import Document, DocEvent, save_document_in_history
 from name.models import IesgDocStateName, DocStateName, DocInfoTagName
 from person.models import Person, Email
 
@@ -221,7 +221,7 @@ def move_file(f):
             doc.iesg_state = dead_state
             log_state_changed(None, doc, system, prev)
 
-        e = Event(doc=doc, by=system)
+        e = DocEvent(doc=doc, by=system)
         e.type = "expired_document"
         e.desc = "Document has expired"
         e.save()

ietf/idrfc/idrfc_wrapper.py

@@ -436,7 +436,7 @@ def iesg_note(self):
     def state_date(self):
         try:
             if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-                return self._idinternal.event_set.filter(
+                return self._idinternal.docevent_set.filter(
                     Q(desc__istartswith="Draft Added by ")|
                     Q(desc__istartswith="Draft Added in state ")|
                     Q(desc__istartswith="Draft added in state ")|
@@ -647,8 +647,8 @@ def _init(self):
         positions = []
         seen = {}
 
-        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'):
+        from doc.models import BallotPositionDocEvent
+	for pos in BallotPositionDocEvent.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.name,
                          ad_username=pos.ad.pk, # ought to rename this in doc_ballot_list

ietf/idrfc/lastcall.py

@@ -8,7 +8,7 @@
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
 
-from doc.models import Document, Event, LastCallEvent, WriteupEvent, save_document_in_history
+from doc.models import Document, DocEvent, LastCallDocEvent, WriteupDocEvent, save_document_in_history
 from name.models import IesgDocStateName
 from person.models import Person
 
@@ -31,7 +31,7 @@ def request_last_callREDESIGN(request, doc):
 
     send_last_call_request(request, doc)
 
-    e = Event()
+    e = DocEvent()
     e.type = "requested_last_call"
     e.by = request.user.get_profile()
     e.doc = doc
@@ -48,7 +48,7 @@ def get_expired_last_calls():
 def get_expired_last_callsREDESIGN():
     today = datetime.date.today()
     for d in Document.objects.filter(iesg_state="lc"):
-        e = d.latest_event(LastCallEvent, type="sent_last_call")
+        e = d.latest_event(LastCallDocEvent, type="sent_last_call")
         if e and e.expires.date() <= today:
             yield d
 
@@ -73,7 +73,7 @@ def expire_last_call(doc):
 def expire_last_callREDESIGN(doc):
     state = IesgDocStateName.objects.get(slug="writeupw")
 
-    e = doc.latest_event(WriteupEvent, type="changed_ballot_writeup_text")
+    e = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
     if e and "What does this protocol do and why" not in e.text:
         # if it boiler-plate text has been removed, we assume the
         # write-up has been written

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 WriteupEvent, BallotPositionEvent, LastCallEvent
+from doc.models import WriteupDocEvent, BallotPositionDocEvent, LastCallDocEvent
 from person.models import Person
 
 def email_state_changed(request, doc, text):
@@ -86,7 +86,7 @@ def full_intended_status(intended_status):
         return "a %s" % s
 
 def generate_ballot_writeup(request, doc):
-    e = WriteupEvent()
+    e = WriteupDocEvent()
     e.type = "changed_ballot_writeup_text"
     e.by = request.user.get_profile()
     e.doc = doc
@@ -158,7 +158,7 @@ def generate_last_call_announcementREDESIGN(request, doc):
                                  )
                             )
 
-    e = WriteupEvent()
+    e = WriteupDocEvent()
     e.type = "changed_last_call_text"
     e.by = request.user.get_profile()
     e.doc = doc
@@ -253,7 +253,7 @@ def generate_approval_mailREDESIGN(request, doc):
     else:
         mail = generate_approval_mail_approved(request, doc)
 
-    e = WriteupEvent()
+    e = WriteupDocEvent()
     e.type = "changed_ballot_approval_text"
     e.by = request.user.get_profile()
     e.doc = doc
@@ -479,7 +479,7 @@ def generate_issue_ballot_mailREDESIGN(request, doc):
     active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
 
     e = doc.latest_event(type="started_iesg_process")
-    positions = BallotPositionEvent.objects.filter(doc=doc, type="changed_ballot_position", time__gte=e.time).order_by("-time", '-id').select_related('ad')
+    positions = BallotPositionDocEvent.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,13 +519,13 @@ def formatted(val):
     inactive_ad_positions.sort()
     ad_feedback.sort(key=lambda p: p.ad.name)
 
-    e = doc.latest_event(LastCallEvent, type="sent_last_call")
+    e = doc.latest_event(LastCallDocEvent, type="sent_last_call")
     last_call_expires = e.expires if e else None
 
-    e = doc.latest_event(WriteupEvent, type="changed_ballot_approval_text")
+    e = doc.latest_event(WriteupDocEvent, type="changed_ballot_approval_text")
     approval_text = e.text if e else ""
 
-    e = doc.latest_event(WriteupEvent, type="changed_ballot_writeup_text")
+    e = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
     ballot_writeup = e.text if e else ""
 
     return render_to_string("idrfc/issue_ballot_mailREDESIGN.txt",

ietf/idrfc/mirror_rfc_index.py

@@ -179,7 +179,7 @@ def get_stream_mapping():
 @django.db.transaction.commit_on_success
 def insert_to_databaseREDESIGN(data):
     from person.models import Person
-    from doc.models import Document, DocAlias, Event, RelatedDocument
+    from doc.models import Document, DocAlias, DocEvent, RelatedDocument
     from group.models import Group
     from name.models import DocInfoTagName, DocRelationshipName
     from name.utils import name
@@ -256,7 +256,7 @@ def insert_to_databaseREDESIGN(data):
 
         pubdate = datetime.strptime(rfc_published_date, "%Y-%m-%d")
         if not doc.latest_event(type="published_rfc", time=pubdate):
-            e = Event(doc=doc, type="published_rfc")
+            e = DocEvent(doc=doc, type="published_rfc")
             e.time = pubdate
             e.by = system
             e.desc = "RFC published"