Changes when returning_item is automatically set to match the current IESGs preferences.

Removes several chunks of dead code related to editing telechat dates.
Improves returning item tests.

Partially addresses ietf-tools#1209
Commit ready for merge.
 - Legacy-Id: 8262

Author: rjsparks

ietf/doc/tests_ballot.py

@@ -475,7 +475,7 @@ def helper_test_defer(self,name):
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name=name)
         self.assertEqual(doc.telechat_date(), second_date)
-        self.assertTrue(doc.returning_item())
+        self.assertFalse(doc.returning_item())
         defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer'],statchg=['statchg','defer'])
         if doc.type_id in defer_states:
            self.assertEqual(doc.get_state(defer_states[doc.type_id][0]).slug,defer_states[doc.type_id][1])

ietf/doc/tests_charter.py

@@ -138,6 +138,35 @@ def test_edit_telechat_date(self):
         charter = Document.objects.get(name=charter.name)
         self.assertTrue(not charter.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date)
 
+    def test_no_returning_item_for_different_ballot(self):
+        make_test_data()
+
+        group = Group.objects.get(acronym="ames")
+        charter = group.charter
+        url = urlreverse('charter_telechat_date', kwargs=dict(name=charter.name))
+        login_testing_unauthorized(self, "secretary", url)
+        login = Person.objects.get(user__username="secretary")
+
+        # Make it so that the charter has been through internal review, and passed its external review
+        # ballot on a previous telechat 
+        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        BallotDocEvent.objects.create(type='created_ballot',by=login,doc=charter,
+                                      ballot_type=BallotType.objects.get(doc_type=charter.type,slug='r-extrev'),
+                                      time=last_week)
+        TelechatDocEvent.objects.create(type='scheduled_for_telechat',doc=charter,by=login,telechat_date=last_week,returning_item=False)
+        BallotDocEvent.objects.create(type='created_ballot',by=login,doc=charter,
+                                      ballot_type=BallotType.objects.get(doc_type=charter.type,slug='approve'))
+        
+        # Put the charter onto a future telechat and verify returning item is not set
+        telechat_date = TelechatDate.objects.active()[1].date
+        r = self.client.post(url, dict(name=group.name, acronym=group.acronym, telechat_date=telechat_date.isoformat()))
+        self.assertEqual(r.status_code, 302)
+        
+        charter = Document.objects.get(name=charter.name)
+        telechat_event = charter.latest_event(TelechatDocEvent, "scheduled_for_telechat")
+        self.assertEqual(telechat_event.telechat_date, telechat_date)
+        self.assertFalse(telechat_event.returning_item)
+
     def test_edit_notify(self):
         make_test_data()
 

ietf/doc/tests_conflict_review.py

@@ -224,17 +224,11 @@ def test_edit_telechat_date(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date)
 
-        # move it forward a telechat (this should set the returning item bit)
+        # move it forward a telechat (this should NOT set the returning item bit)
         telechat_date = TelechatDate.objects.active().order_by('date')[1].date
         r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
-        self.assertTrue(doc.returning_item())
-
-        # clear the returning item bit
-        r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
-        self.assertEqual(r.status_code,302)
-        doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertFalse(doc.returning_item())
 
         # set the returning item bit without changing the date
@@ -243,6 +237,12 @@ def test_edit_telechat_date(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertTrue(doc.returning_item())
 
+        # clear the returning item bit
+        r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
+        self.assertEqual(r.status_code,302)
+        doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
+        self.assertFalse(doc.returning_item())
+
         # Take the doc back off any telechat
         r = self.client.post(url,dict(telechat_date=""))
         self.assertEqual(r.status_code, 302)

ietf/doc/tests_draft.py

@@ -10,7 +10,8 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import ( Document, DocAlias, DocReminder, DocumentAuthor, DocEvent,
-    ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent, WriteupDocEvent )
+    ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent, 
+    WriteupDocEvent, BallotDocEvent)
 from ietf.doc.utils import get_tags_for_stream_id
 from ietf.name.models import StreamName, IntendedStdLevelName, DocTagName
 from ietf.group.models import Group
@@ -255,7 +256,25 @@ def test_edit_telechat_date(self):
         self.assertEqual(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
-        self.assertEqual(draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date, TelechatDate.objects.active()[1].date)
+        telechat_event = draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
+        self.assertEqual(telechat_event.telechat_date, TelechatDate.objects.active()[1].date)
+        self.assertFalse(telechat_event.returning_item)
+
+        # change to a telechat that should cause returning item to be auto-detected
+        # First, make it appear that the previous telechat has already passed
+        telechat_event.telechat_date = datetime.date.today()-datetime.timedelta(days=7)
+        telechat_event.save()
+        ballot = draft.latest_event(BallotDocEvent, type="created_ballot")
+        ballot.time = telechat_event.telechat_date
+        ballot.save()
+
+        r = self.client.post(url, data)
+        self.assertEqual(r.status_code, 302)
+
+        draft = Document.objects.get(name=draft.name)
+        telechat_event = draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
+        self.assertEqual(telechat_event.telechat_date, TelechatDate.objects.active()[1].date)
+        self.assertTrue(telechat_event.returning_item)
 
         # remove from agenda
         data["telechat_date"] = ""

ietf/doc/tests_status_change.py

@@ -204,17 +204,11 @@ def test_edit_telechat_date(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,telechat_date)
 
-        # move it forward a telechat (this should set the returning item bit)
+        # move it forward a telechat (this should NOT set the returning item bit)
         telechat_date = TelechatDate.objects.active().order_by('date')[1].date
         r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
-        self.assertTrue(doc.returning_item())
-
-        # clear the returning item bit
-        r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
-        self.assertEqual(r.status_code,302)
-        doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertFalse(doc.returning_item())
 
         # set the returning item bit without changing the date
@@ -223,6 +217,12 @@ def test_edit_telechat_date(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertTrue(doc.returning_item())
 
+        # clear the returning item bit
+        r = self.client.post(url,dict(telechat_date=telechat_date.isoformat()))
+        self.assertEqual(r.status_code,302)
+        doc = Document.objects.get(name='status-change-imaginary-mid-review')
+        self.assertFalse(doc.returning_item())
+
         # Take the doc back off any telechat
         r = self.client.post(url,dict(telechat_date=""))
         self.assertEqual(r.status_code, 302)

ietf/doc/utils.py

@@ -2,6 +2,7 @@
 import re
 import urllib
 import math
+import datetime
 
 from django.conf import settings
 from django.db.models.query import EmptyQuerySet
@@ -315,7 +316,14 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
     prev_returning = bool(prev and prev.returning_item)
     prev_telechat = prev.telechat_date if prev else None
     prev_agenda = bool(prev_telechat)
-    
+    prev_telechat_happened = prev_telechat and prev_telechat < datetime.date.today()
+
+    prev_same_ballot = False
+    if prev_telechat:
+         prev_ballot = doc.docevent_set.filter(ballotdocevent__type='created_ballot').exclude(time__gt=prev_telechat).order_by('-time').first()
+         cur_ballot  = doc.docevent_set.filter(ballotdocevent__type='created_ballot').order_by('-time').first()
+         prev_same_ballot = (prev_ballot == cur_ballot)
+
     returning_item_changed = bool(new_returning_item != None and new_returning_item != prev_returning)
 
     if new_returning_item == None:
@@ -328,8 +336,13 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
         return
 
     # auto-update returning item
-    if (not returning_item_changed and on_agenda and prev_agenda
-        and new_telechat_date != prev_telechat):
+    if (     not returning_item_changed 
+         and on_agenda 
+         and prev_agenda
+         and new_telechat_date != prev_telechat
+         and prev_telechat_happened
+         and prev_same_ballot
+       ):
         returning = True
 
     e = TelechatDocEvent()

ietf/doc/utils_charter.py

@@ -83,34 +83,6 @@ def historic_milestones_for_charter(charter, rev):
 
     return res
 
-
-def update_telechat(request, doc, by, new_telechat_date):
-    # FIXME: reuse function in doc/utils.py instead of this one
-    # (need to fix auto-setting returning item problem first though)
-    from ietf.doc.models import TelechatDocEvent
-    
-    on_agenda = bool(new_telechat_date)
-
-    prev = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-    prev_telechat = prev.telechat_date if prev else None
-    prev_agenda = bool(prev_telechat)
-    
-    e = TelechatDocEvent()
-    e.type = "scheduled_for_telechat"
-    e.by = by
-    e.doc = doc
-    e.telechat_date = new_telechat_date
-    
-    if on_agenda != prev_agenda:
-        if on_agenda:
-            e.desc = "Placed on agenda for telechat - %s" % new_telechat_date
-        else:
-            e.desc = "Removed from agenda for telechat"
-        e.save()
-    elif on_agenda and new_telechat_date != prev_telechat:
-        e.desc = "Telechat date has been changed to <b>%s</b> from <b>%s</b>" % (new_telechat_date, prev_telechat)
-        e.save()
-
 def email_state_changed(request, doc, text):
     to = [e.strip() for e in doc.notify.replace(';', ',').split(',')]
     if not to:

ietf/doc/views_draft.py

@@ -29,6 +29,7 @@
 from ietf.ietfauth.utils import role_required
 from ietf.message.models import Message
 from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
+from ietf.doc.forms import TelechatForm
 from ietf.person.forms import EmailsField
 from ietf.person.models import Person, Email
 from ietf.secr.lib.template import jsonapi
@@ -877,21 +878,6 @@ def edit_notices(request, name):
                               },
                               context_instance = RequestContext(request))
 
-class TelechatForm(forms.Form):
-    telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False)
-    returning_item = forms.BooleanField(required=False)
-
-    def __init__(self, *args, **kwargs):
-        super(self.__class__, self).__init__(*args, **kwargs)
-
-        dates = [d.date for d in TelechatDate.objects.active().order_by('date')]
-        init = kwargs['initial'].get("telechat_date")
-        if init and init not in dates:
-            dates.insert(0, init)
-
-        self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, d.strftime("%Y-%m-%d")) for d in dates]
-        
-
 @role_required("Area Director", "Secretariat")
 def telechat_date(request, name):
     doc = get_object_or_404(Document, type="draft", name=name)