merged forward. Gave IAB same abilities as IESG.

 - Legacy-Id: 19201

Author: rjsparks

ietf/doc/admin.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
+# Copyright The IETF Trust 2010-2021, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -11,7 +11,8 @@
     StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
     TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent,
     AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL,
-    ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder )
+    ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder,
+    BofreqEditorDocEvent )
 
 from ietf.utils.validators import validate_external_resource_value
 
@@ -192,6 +193,10 @@ class BallotPositionDocEventAdmin(DocEventAdmin):
 class IRSGBallotDocEventAdmin(DocEventAdmin):
     raw_id_fields = ["doc", "by"]
 admin.site.register(IRSGBallotDocEvent, IRSGBallotDocEventAdmin)
+
+class BofreqEditorDocEventAdmin(DocEventAdmin):
+    raw_id_fields = ["doc", "by", "editors" ]
+admin.site.register(BofreqEditorDocEvent, BofreqEditorDocEventAdmin)
 
 class DocumentUrlAdmin(admin.ModelAdmin):
     list_display = ['id', 'doc', 'tag', 'url', 'desc', ]

ietf/doc/factories.py

@@ -13,8 +13,11 @@
 
 from ietf.doc.models import ( Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor,
     StateDocEvent, BallotPositionDocEvent, BallotDocEvent, BallotType, IRSGBallotDocEvent, TelechatDocEvent,
-    DocumentActionHolder)
+    DocumentActionHolder, BofreqEditorDocEvent )
 from ietf.group.models import Group
+from ietf.person.factories import PersonFactory
+from ietf.utils.text import xslugify
+
 
 def draft_name_generator(type_id,group,n):
         return '%s-%s-%s-%s%d'%( 
@@ -379,3 +382,39 @@ class Meta:
 
 class WgDocumentAuthorFactory(DocumentAuthorFactory):
     document = factory.SubFactory(WgDraftFactory)
+
+class BofreqEditorDocEventFactory(DocEventFactory):
+    class Meta:
+        model = BofreqEditorDocEvent
+
+    type = "changed_editors"
+    doc = factory.SubFactory('ietf.doc.factories.BofreqFactory')
+
+
+    @factory.post_generation
+    def editors(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            obj.editors.set(extracted)
+        else:
+            obj.editors.set(PersonFactory.create_batch(3))
+        obj.desc = f'Changed editors to {", ".join(obj.editors.values_list("name",flat=True)) or "(None)"}'
+
+class BofreqFactory(BaseDocumentFactory):
+    type_id = 'bofreq'
+    title = factory.Faker('sentence')
+    name = factory.LazyAttribute(lambda o: 'bofreq-%s'%(xslugify(o.title)))
+
+    bofreqeditordocevent = factory.RelatedFactory('ietf.doc.factories.BofreqEditorDocEventFactory','doc')
+
+    @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))
+        else:
+            obj.set_state(State.objects.get(type_id='bofreq',slug='proposed'))
+

ietf/doc/mails.py

@@ -18,7 +18,7 @@
 from ietf.utils import log
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ipr.utils import iprs_from_docs, related_docs
-from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent
+from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent, BofreqEditorDocEvent
 from ietf.doc.utils import needed_ballot_positions
 from ietf.group.models import Role
 from ietf.doc.models import Document
@@ -689,3 +689,30 @@ def send_external_resource_change_request(request, doc, submitter_info, requeste
                   doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
               ),
               cc=list(cc),)
+
+def email_bofreq_title_changed(request, bofreq):
+    addrs = gather_address_lists('bofreq_title_changed', doc=bofreq)
+
+    send_mail(request, addrs.to, settings.DEFAULT_FROM_EMAIL,
+              f'BOF Request title changed : {bofreq.name}',
+              'doc/mail/bofreq_title_changed.txt',
+              dict(bofreq=bofreq, request=request),
+              cc=addrs.cc)
+
+def email_bofreq_editors_changed(request, bofreq, previous_editors):
+    editors = bofreq.latest_event(BofreqEditorDocEvent).editors.all()
+    addrs = gather_address_lists('bofreq_editors_changed', doc=bofreq, previous_editors=previous_editors)
+
+    send_mail(request, addrs.to, settings.DEFAULT_FROM_EMAIL,
+              f'BOF Request editors changed : {bofreq.name}',
+              'doc/mail/bofreq_editors_changed.txt',
+              dict(bofreq=bofreq, request=request, editors=editors, previous_editors=previous_editors),
+              cc=addrs.cc)
+
+def email_bofreq_new_revision(request, bofreq):
+    addrs = gather_address_lists('bofreq_new_revision', doc=bofreq)
+    send_mail(request, addrs.to, settings.DEFAULT_FROM_EMAIL,
+              f'New BOF request revision uploaded: {bofreq.name}-{bofreq.rev}',
+              'doc/mail/bofreq_new_revision.txt',
+              dict(bofreq=bofreq, request=request ),
+              cc=addrs.cc)

ietf/doc/migrations/0042_bofreq_states.py

@@ -0,0 +1,36 @@
+# Copyright The IETF Trust 2021 All Rights Reserved
+
+# Generated by Django 2.2.23 on 2021-05-21 13:29
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    StateType = apps.get_model('doc', 'StateType')
+    State = apps.get_model('doc', 'State')
+
+    StateType.objects.create(slug='bofreq', label='Bof Request State')
+    proposed = State.objects.create(type_id='bofreq', slug='proposed', name='Proposed', used=True, desc='The bof request is proposed', order=0)
+    approved = State.objects.create(type_id='bofreq', slug='approved', name='Approved', used=True, desc='The bof request is approved', order=1)
+    declined = State.objects.create(type_id='bofreq', slug='declined', name='Declined', used=True, desc='The bof request is declined', order=2)
+    replaced = State.objects.create(type_id='bofreq', slug='replaced', name='Replaced', used=True, desc='The bof request is proposed', order=3)
+    abandoned = State.objects.create(type_id='bofreq', slug='abandoned', name='Abandoned', used=True, desc='The bof request is abandoned', order=4)
+
+    proposed.next_states.set([approved,declined,replaced,abandoned])
+
+def reverse(apps, schema_editor):
+    StateType = apps.get_model('doc', 'StateType')
+    State = apps.get_model('doc', 'State')
+    State.objects.filter(type_id='bofreq').delete()
+    StateType.objects.filter(slug='bofreq').delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0041_add_documentactionholder'),
+        ('name', '0027_add_bofrequest'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/doc/migrations/0043_bofreqeditordocevent.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.23 on 2021-05-25 12:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0018_auto_20201109_0439'),
+        ('doc', '0042_bofreq_states'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BofreqEditorDocEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
+                ('editors', models.ManyToManyField(blank=True, to='person.Person')),
+            ],
+            bases=('doc.docevent',),
+        ),
+    ]

ietf/doc/models.py

@@ -142,6 +142,8 @@ def get_file_path(self):
                 self._cached_file_path = settings.CONFLICT_REVIEW_PATH
             elif self.type_id == "statchg":
                 self._cached_file_path = settings.STATUS_CHANGE_PATH
+            elif self.type_id == "bofreq":
+                self._cached_file_path = settings.BOFREQ_PATH
             else:
                 self._cached_file_path = settings.DOCUMENT_PATH_PATTERN.format(doc=self)
         return self._cached_file_path
@@ -163,6 +165,8 @@ def get_base_name(self):
             elif self.type_id == 'review':
                 # TODO: This will be wrong if a review is updated on the same day it was created (or updated more than once on the same day)
                 self._cached_base_name = "%s.txt" % self.name
+            elif self.type_id == 'bofreq':
+                self._cached_base_name = "%s-%s.md" % (self.name, self.rev)
             else:
                 if self.rev:
                     self._cached_base_name = "%s-%s.txt" % (self.canonical_name(), self.rev)
@@ -1145,6 +1149,9 @@ class DocReminder(models.Model):
     # IPR events
     ("posted_related_ipr", "Posted related IPR"),
     ("removed_related_ipr", "Removed related IPR"),
+
+    # Bofreq Editor events
+    ("changed_editors", "Changed BOF Request editors")
     ]
 
 class DocEvent(models.Model):
@@ -1340,3 +1347,6 @@ class EditedAuthorsDocEvent(DocEvent):
         Example 'basis' values might be from ['manually adjusted','recomputed by parsing document', etc.]
     """
     basis = models.CharField(help_text="What is the source or reasoning for the changes to the author list",max_length=255)
+
+class BofreqEditorDocEvent(DocEvent):
+    editors = models.ManyToManyField('person.Person',blank=True)

ietf/doc/resources.py

@@ -17,7 +17,7 @@
     InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument,
     RelatedDocHistory, BallotPositionDocEvent, AddedMessageEvent, SubmissionDocEvent,
     ReviewRequestDocEvent, ReviewAssignmentDocEvent, EditedAuthorsDocEvent, DocumentURL,
-    IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder )
+    IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder, BofreqEditorDocEvent)
 
 from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource
 class BallotTypeResource(ModelResource):
@@ -806,3 +806,29 @@ class Meta:
             "person": ALL_WITH_RELATIONS,
         }
 api.doc.register(DocumentActionHolderResource())
+
+
+from ietf.person.resources import PersonResource
+class BofreqEditorDocEventResource(ModelResource):
+    by               = ToOneField(PersonResource, 'by')
+    doc              = ToOneField(DocumentResource, 'doc')
+    docevent_ptr     = ToOneField(DocEventResource, 'docevent_ptr')
+    editors          = ToManyField(PersonResource, 'editors', null=True)
+    class Meta:
+        queryset = BofreqEditorDocEvent.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'bofreqeditordocevent'
+        ordering = ['docevent_ptr', ]
+        filtering = { 
+            "id": ALL,
+            "time": ALL,
+            "type": ALL,
+            "rev": ALL,
+            "desc": ALL,
+            "by": ALL_WITH_RELATIONS,
+            "doc": ALL_WITH_RELATIONS,
+            "docevent_ptr": ALL_WITH_RELATIONS,
+            "editors": ALL_WITH_RELATIONS,
+        }
+api.doc.register(BofreqEditorDocEventResource())