Add RFC 8989 nomcom eligibility calculations. Commit ready for merge.

 - Legacy-Id: 18975

Author: rjsparks

ietf/doc/factories.py

@@ -365,3 +365,14 @@ class Meta:
 
     document = factory.SubFactory(WgDraftFactory)
     person = factory.SubFactory('ietf.person.factories.PersonFactory')
+
+class DocumentAuthorFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = DocumentAuthor
+
+    document = factory.SubFactory(DocumentFactory)
+    person = factory.SubFactory('ietf.person.factories.PersonFactory')
+    email = factory.LazyAttribute(lambda obj: obj.person.email())
+
+class WgDocumentAuthorFactory(DocumentAuthorFactory):
+    document = factory.SubFactory(WgDraftFactory)

ietf/group/factories.py

@@ -5,7 +5,8 @@
 
 from typing import List    # pyflakes:ignore
 
-from ietf.group.models import Group, Role, GroupEvent, GroupMilestone
+from ietf.group.models import Group, Role, GroupEvent, GroupMilestone, \
+                              GroupHistory, RoleHistory
 from ietf.review.factories import ReviewTeamSettingsFactory
 
 class GroupFactory(factory.DjangoModelFactory):
@@ -71,3 +72,25 @@ class DatelessGroupMilestoneFactory(BaseGroupMilestoneFactory):
     group = factory.SubFactory(GroupFactory, uses_milestone_dates=False)
     order = factory.Sequence(lambda n: n)
 
+class GroupHistoryFactory(factory.DjangoModelFactory):
+    class Meta:
+        model=GroupHistory
+
+    name = factory.LazyAttribute(lambda obj: obj.group.name)
+    state_id = 'active'
+    type_id = factory.LazyAttribute(lambda obj: obj.group.type_id)
+    list_email = factory.LazyAttribute(lambda obj: '%s@ietf.org'% obj.group.acronym)
+    uses_milestone_dates = True
+    used_roles = [] # type: List[str]
+
+    group = factory.SubFactory(GroupFactory)
+    acronym = factory.LazyAttribute(lambda obj: obj.group.acronym)
+
+class RoleHistoryFactory(factory.DjangoModelFactory):
+    class Meta:
+        model=RoleHistory
+
+    group = factory.SubFactory(GroupHistoryFactory)
+    person = factory.SubFactory('ietf.person.factories.PersonFactory')
+    email = factory.LazyAttribute(lambda obj: obj.person.email())
+

ietf/meeting/utils.py

@@ -18,12 +18,11 @@
 import debug                            # pyflakes:ignore
 
 from ietf.dbtemplate.models import DBTemplate
-from ietf.meeting.models import Session, Meeting, SchedulingEvent, TimeSlot, Constraint, SchedTimeSessAssignment
-from ietf.group.models import Group, Role
+from ietf.meeting.models import Session, SchedulingEvent, TimeSlot, Constraint, SchedTimeSessAssignment
+from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
 from ietf.name.models import SessionStatusName, ConstraintName
-from ietf.nomcom.utils import DISQUALIFYING_ROLE_QUERY_EXPRESSION
-from ietf.person.models import Person, Email
+from ietf.person.models import Person
 from ietf.secr.proceedings.proc_utils import import_audio_files
 
 def session_time_for_sorting(session, use_meeting_date):
@@ -171,25 +170,6 @@ def finalize(meeting):
     meeting.save()
     return
 
-def attended_ietf_meetings(person):
-    email_addresses = Email.objects.filter(person=person).values_list('address',flat=True)
-    return Meeting.objects.filter(
-                type='ietf',
-                meetingregistration__email__in=email_addresses,
-                meetingregistration__attended=True,
-            )
-
-def attended_in_last_five_ietf_meetings(person, date=datetime.datetime.today()):
-    previous_five = Meeting.objects.filter(type='ietf',date__lte=date).order_by('-date')[:5]
-    attended = attended_ietf_meetings(person)
-    return set(previous_five).intersection(attended)
-
-def is_nomcom_eligible(person, date=datetime.date.today()):
-    attended = attended_in_last_five_ietf_meetings(person, date)
-    disqualifying_roles = Role.objects.filter(person=person).filter(DISQUALIFYING_ROLE_QUERY_EXPRESSION)
-    return len(attended)>=3 and not disqualifying_roles.exists()
-
-
 def sort_accept_tuple(accept):
     tup = []
     if accept:

ietf/nomcom/migrations/0010_nomcom_first_call_for_volunteers.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.20 on 2021-04-22 14:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nomcom', '0009_auto_20201109_0439'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='nomcom',
+            name='first_call_for_volunteers',
+            field=models.DateField(blank=True, null=True, verbose_name='Date of the first call for volunteers'),
+        ),
+    ]

ietf/nomcom/models.py

@@ -59,6 +59,7 @@ class NomCom(models.Model):
                                                 help_text='Display pictures of each nominee (if available) on the feedback pages')
     show_accepted_nominees = models.BooleanField(verbose_name='Show accepted nominees', default=True, 
                                                  help_text='Show accepted nominees on the public nomination page')
+    first_call_for_volunteers = models.DateField(verbose_name='Date of the first call for volunteers', blank=True, null=True)
 
     class Meta:
         verbose_name_plural = 'NomComs'