12/13 merged into 6.113.1.dev0 with migration ordering failure

 - Legacy-Id: 17149

Author: Spectre17

ietf/doc/admin.py

@@ -12,7 +12,7 @@
     StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
     TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent,
     AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL,
-    ReviewAssignmentDocEvent, IanaExpertDocEvent )
+    ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent )
 
 
 class StateTypeAdmin(admin.ModelAdmin):
@@ -164,8 +164,12 @@ class DeletedEventAdmin(admin.ModelAdmin):
 admin.site.register(DeletedEvent, DeletedEventAdmin)
 
 class BallotPositionDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by", "ad", "ballot"]
+    raw_id_fields = ["doc", "by", "pos_by", "ballot"]
 admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin)
+ 
+class IRSGBallotDocEventAdmin(DocEventAdmin):
+    raw_id_fields = ["doc", "by"]
+admin.site.register(IRSGBallotDocEvent, IRSGBallotDocEventAdmin)
 
 class DocumentUrlAdmin(admin.ModelAdmin):
     list_display = ['id', 'doc', 'tag', 'url', 'desc', ]

ietf/doc/factories.py

@@ -14,7 +14,7 @@
 
 from django.conf import settings
 
-from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor, StateDocEvent, BallotPositionDocEvent, BallotDocEvent, BallotType
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor, StateDocEvent, BallotPositionDocEvent, BallotDocEvent, BallotType, IRSGBallotDocEvent
 from ietf.group.models import Group
 
 def draft_name_generator(type_id,group,n):
@@ -192,6 +192,26 @@ def states(obj, create, extracted, **kwargs):
             obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
 
 
+class RgRfcFactory(RgDraftFactory):
+
+    alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000)))
+
+    std_level_id = 'inf'
+
+    @factory.post_generation
+    def states(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            for (state_type_id,state_slug) in extracted:
+                obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
+            if not obj.get_state('draft-stream-irtf'):
+                obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub'))
+        else:
+            obj.set_state(State.objects.get(type_id='draft',slug='rfc'))
+            obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub'))
+
+
 class CharterFactory(BaseDocumentFactory):
 
     type_id = 'charter'
@@ -296,9 +316,10 @@ def state(obj, create, extracted, **kwargs):
 class BallotTypeFactory(factory.DjangoModelFactory):
     class Meta:
         model = BallotType
+        django_get_or_create = ('slug','doc_type_id')
 
-    doc_type_id = 'draft'
     slug = 'approve'
+    doc_type_id = 'draft'
 
 
 class BallotDocEventFactory(DocEventFactory):
@@ -308,6 +329,13 @@ class Meta:
     ballot_type = factory.SubFactory(BallotTypeFactory)
     type = 'created_ballot'
 
+class IRSGBallotDocEventFactory(BallotDocEventFactory):
+    class Meta:
+        model = IRSGBallotDocEvent
+
+    duedate = datetime.datetime.now() + datetime.timedelta(days=14)
+    ballot_type = factory.SubFactory(BallotTypeFactory, slug='irsg-approve')
+
 class BallotPositionDocEventFactory(DocEventFactory):
     class Meta:
         model = BallotPositionDocEvent
@@ -319,6 +347,6 @@ class Meta:
     # separately and passing the same doc into thier factories.
     ballot = factory.SubFactory(BallotDocEventFactory) 
 
-    ad = factory.SubFactory('ietf.person.factories.PersonFactory')
+    pos_by = factory.SubFactory('ietf.person.factories.PersonFactory')
     pos_id = 'discuss'
 

ietf/doc/mails.py

@@ -382,7 +382,7 @@ def generate_issue_ballot_mail(request, doc, ballot):
                                  last_call_has_expired=last_call_has_expired,
                                  needed_ballot_positions=
                                    needed_ballot_positions(doc,
-                                     list(doc.active_ballot().active_ad_positions().values())
+                                     list(doc.active_ballot().active_balloteer_positions().values())
                                    ),
                                  )
                             )

ietf/doc/migrations/0027_add_irsg_doc_positions.py

@@ -0,0 +1,62 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.22 on 2019-08-03 10:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+# forward, reverse initially copied from migration 0004
+def forward(apps, schema_editor):
+    State = apps.get_model('doc','State')
+    State.objects.create(type_id='draft-stream-irtf',
+                         slug='irsg_review',
+                         name='IRSG Review',
+                         desc='IRSG Review',
+                         used=True,
+                        )
+    BallotPositionName = apps.get_model('name','BallotPositionName')
+    # desc, used, order, and blocking all have suitable defaults
+    BallotPositionName.objects.create(slug="moretime",
+                           name="Need More Time",
+                          )
+    BallotPositionName.objects.create(slug="notready",
+                           name="Not Ready",
+                          )
+
+    # Create a new ballot type for IRSG ballot
+    # include positions for the ballot type
+    BallotType = apps.get_model('doc','BallotType')
+    bt = BallotType.objects.create(doc_type_id="draft",
+                                   slug="irsg-approve",
+                                   name="IRSG Approve",
+                                   question="Is this draft ready for publication in the IRTF stream?",
+                                  )
+    bt.positions.set(['yes','noobj','recuse','notready','moretime'])
+
+def reverse(apps, schema_editor):
+    State = apps.get_model('doc','State')
+    State.objects.filter(type_id__in=('draft-stream-irtf',), slug='irsg_review').delete()
+
+    Position = apps.get_model('name','BallotPositionName')
+    for pos in ("moretime", "notready"):
+        Position.objects.filter(slug=pos).delete()
+
+    IRSGBallot = apps.get_model('doc','BallotType')
+    IRSGBallot.objects.filter(slug="irsg-approve").delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0026_add_draft_rfceditor_state'),
+        ('name', '0007_fix_m2m_slug_id_length'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse),
+        migrations.RenameField(
+            model_name='ballotpositiondocevent',
+            old_name='ad',
+            new_name='pos_by',
+        ),
+
+    ]

ietf/doc/migrations/0028_irsgballotdocevent.py

@@ -0,0 +1,25 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-10-10 10:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0027_add_irsg_doc_positions'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IRSGBallotDocEvent',
+            fields=[
+                ('ballotdocevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.BallotDocEvent')),
+                ('duedate', models.DateTimeField(blank=True, null=True)),
+            ],
+            bases=('doc.ballotdocevent',),
+        ),
+    ]

ietf/doc/models.py

@@ -27,7 +27,7 @@
     DocRelationshipName, DocReminderTypeName, BallotPositionName, ReviewRequestStateName, ReviewAssignmentStateName, FormalLanguageName,
     DocUrlTagName)
 from ietf.person.models import Email, Person
-from ietf.person.utils import get_active_ads
+from ietf.person.utils import get_active_balloteers
 from ietf.utils import log
 from ietf.utils.admin import admin_link
 from ietf.utils.decorators import memoize
@@ -656,7 +656,7 @@ def filename_with_rev(self):
 
     def latest_event(self, *args, **filter_args):
         """Get latest event of optional Python type and with filter
-        arguments, e.g. d.latest_event(type="xyz") returns an DocEvent
+        arguments, e.g. d.latest_event(type="xyz") returns a DocEvent
         while d.latest_event(WriteupDocEvent, type="xyz") returns a
         WriteupDocEvent event."""
         model = args[0] if args else DocEvent
@@ -1082,36 +1082,36 @@ class Meta:
 class BallotDocEvent(DocEvent):
     ballot_type = ForeignKey(BallotType)
 
-    def active_ad_positions(self):
-        """Return dict mapping each active AD to a current ballot position (or None if they haven't voted)."""
+    def active_balloteer_positions(self):
+        """Return dict mapping each active AD or IRSG member to a current ballot position (or None if they haven't voted)."""
         res = {}
 
-        active_ads = get_active_ads()
-        positions = BallotPositionDocEvent.objects.filter(type="changed_ballot_position",ad__in=active_ads, ballot=self).select_related('ad', 'pos').order_by("-time", "-id")
+        active_balloteers = get_active_balloteers(self.ballot_type)
+        positions = BallotPositionDocEvent.objects.filter(type="changed_ballot_position",pos_by__in=active_balloteers, ballot=self).select_related('pos_by', 'pos').order_by("-time", "-id")
 
         for pos in positions:
-            if pos.ad not in res:
-                res[pos.ad] = pos
+            if pos.pos_by not in res:
+                res[pos.pos_by] = pos
 
-        for ad in active_ads:
-            if ad not in res:
-                res[ad] = None
+        for balloteer in active_balloteers:
+            if balloteer not in res:
+                res[balloteer] = None
         return res
 
     def all_positions(self):
         """Return array holding the current and past positions per AD"""
 
         positions = []
         seen = {}
-        active_ads = get_active_ads()
-        for e in BallotPositionDocEvent.objects.filter(type="changed_ballot_position", ballot=self).select_related('ad', 'pos').order_by("-time", '-id'):
-            if e.ad not in seen:
-                e.old_ad = e.ad not in active_ads
+        active_balloteers = get_active_balloteers(self.ballot_type)
+        for e in BallotPositionDocEvent.objects.filter(type="changed_ballot_position", ballot=self).select_related('pos_by', 'pos').order_by("-time", '-id'):
+            if e.pos_by not in seen:
+                e.old_pos_by = e.pos_by not in active_balloteers
                 e.old_positions = []
                 positions.append(e)
-                seen[e.ad] = e
+                seen[e.pos_by] = e
             else:
-                latest = seen[e.ad]
+                latest = seen[e.pos_by]
                 if latest.old_positions:
                     prev = latest.old_positions[-1]
                 else:
@@ -1126,25 +1126,27 @@ def all_positions(self):
             while p.old_positions and p.old_positions[-1].slug == "norecord":
                 p.old_positions.pop()
 
-        # add any missing ADs through fake No Record events
+        # add any missing ADs/IRSGers through fake No Record events
         if self.doc.active_ballot() == self:
             norecord = BallotPositionName.objects.get(slug="norecord")
-            for ad in active_ads:
-                if ad not in seen:
-                    e = BallotPositionDocEvent(type="changed_ballot_position", doc=self.doc, rev=self.doc.rev, ad=ad)
-                    e.by = ad
+            for balloteer in active_balloteers:
+                if balloteer not in seen:
+                    e = BallotPositionDocEvent(type="changed_ballot_position", doc=self.doc, rev=self.doc.rev, pos_by=balloteer)
+                    e.by = balloteer
                     e.pos = norecord
-                    e.old_ad = False
+                    e.old_pos_by = False
                     e.old_positions = []
                     positions.append(e)
 
-        positions.sort(key=lambda p: (p.old_ad, p.ad.last_name()))
+        positions.sort(key=lambda p: (p.old_pos_by, p.pos_by.last_name()))
         return positions
 
+class IRSGBallotDocEvent(BallotDocEvent):
+    duedate = models.DateTimeField(blank=True, null=True)
 
 class BallotPositionDocEvent(DocEvent):
     ballot = ForeignKey(BallotDocEvent, null=True, default=None) # default=None is a temporary migration period fix, should be removed when charter branch is live
-    ad = ForeignKey(Person)
+    pos_by = ForeignKey(Person)
     pos = ForeignKey(BallotPositionName, verbose_name="position", default="norecord")
     discuss = models.TextField(help_text="Discuss text if position is discuss", blank=True)
     discuss_time = models.DateTimeField(help_text="Time discuss text was written", blank=True, null=True)

ietf/doc/resources.py

@@ -17,7 +17,7 @@
     InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument,
     RelatedDocHistory, BallotPositionDocEvent, AddedMessageEvent, SubmissionDocEvent,
     ReviewRequestDocEvent, ReviewAssignmentDocEvent, EditedAuthorsDocEvent, DocumentURL,
-    IanaExpertDocEvent )
+    IanaExpertDocEvent, IRSGBallotDocEvent )
 
 from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource
 class BallotTypeResource(ModelResource):
@@ -531,7 +531,7 @@ class BallotPositionDocEventResource(ModelResource):
     doc              = ToOneField(DocumentResource, 'doc')
     docevent_ptr     = ToOneField(DocEventResource, 'docevent_ptr')
     ballot           = ToOneField(BallotDocEventResource, 'ballot', null=True)
-    ad               = ToOneField(PersonResource, 'ad')
+    pos_by           = ToOneField(PersonResource, 'pos_by')
     pos              = ToOneField(BallotPositionNameResource, 'pos')
     class Meta:
         cache = SimpleCache()
@@ -553,7 +553,7 @@ class Meta:
             "doc": ALL_WITH_RELATIONS,
             "docevent_ptr": ALL_WITH_RELATIONS,
             "ballot": ALL_WITH_RELATIONS,
-            "ad": ALL_WITH_RELATIONS,
+            "pos_by": ALL_WITH_RELATIONS,
             "pos": ALL_WITH_RELATIONS,
         }
 api.doc.register(BallotPositionDocEventResource())
@@ -738,3 +738,32 @@ class Meta:
             "docevent_ptr": ALL_WITH_RELATIONS,
         }
 api.doc.register(IanaExpertDocEventResource())
+
+
+from ietf.person.resources import PersonResource
+class IRSGBallotDocEventResource(ModelResource):
+    by               = ToOneField(PersonResource, 'by')
+    doc              = ToOneField(DocumentResource, 'doc')
+    docevent_ptr     = ToOneField(DocEventResource, 'docevent_ptr')
+    ballot_type      = ToOneField(BallotTypeResource, 'ballot_type')
+    ballotdocevent_ptr = ToOneField(BallotDocEventResource, 'ballotdocevent_ptr')
+    class Meta:
+        queryset = IRSGBallotDocEvent.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'irsgballotdocevent'
+        ordering = ['ballotdocevent_ptr', ]
+        filtering = { 
+            "id": ALL,
+            "time": ALL,
+            "type": ALL,
+            "rev": ALL,
+            "desc": ALL,
+            "duedate": ALL,
+            "by": ALL_WITH_RELATIONS,
+            "doc": ALL_WITH_RELATIONS,
+            "docevent_ptr": ALL_WITH_RELATIONS,
+            "ballot_type": ALL_WITH_RELATIONS,
+            "ballotdocevent_ptr": ALL_WITH_RELATIONS,
+        }
+api.doc.register(IRSGBallotDocEventResource())

ietf/doc/templatetags/ballot_icon.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2019, All rights reserved.
+# Copyright The IETF Trust 2019, All Rights Reserved
 # Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 #
@@ -91,16 +91,16 @@ def sort_key(t):
         else:
             return (1, pos.pos.order)
 
-    positions = list(ballot.active_ad_positions().items())
+    positions = list(ballot.active_balloteer_positions().items())
     positions.sort(key=sort_key)
 
     right_click_string = ''
     if has_role(user, "Area Director"):
         right_click_string = 'oncontextmenu="window.location.href=\'%s\';return false;"' %  urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
 
     my_blocking = False
-    for i, (ad, pos) in enumerate(positions):
-        if user_is_person(user,ad) and pos and pos.pos.blocking:
+    for i, (pos_by, pos) in enumerate(positions):
+        if user_is_person(user,pos_by) and pos and pos.pos.blocking:
             my_blocking = True
             break
 
@@ -153,7 +153,7 @@ def ballotposition(doc, user):
     if not ballot:
         return None
 
-    changed_pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", ad__user=user, ballot=ballot)
+    changed_pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", pos_by__user=user, ballot=ballot)
     if changed_pos:
         pos = changed_pos.pos
     else: