altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [19621] from rjsparks@nostrum.com:

Browse source 
Use rfc8989 for 2022 nomcom eligibility. Fixes #3442.
 - Legacy-Id: 19639
Note: SVN reference [19621] has been migrated to Git commit 181da11a5c
This commit is contained in:
Robert Sparks 2021-11-11 17:31:40 +00:00
parent 164ee7792c 181da11a5c
commit b06e586b1e
2 changed files with 134 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

246
ietf/nomcom/tests.py
View file

@ -2311,13 +2311,17 @@ class rfc8989EligibilityTests(TestCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.nomcom = NomComFactory(group__acronym='nomcom2021', populate_personnel=False, first_call_for_volunteers=datetime.date(2021,5,15)) self.nomcoms = list()
self.nomcoms.append(NomComFactory(group__acronym='nomcom2021', populate_personnel=False, first_call_for_volunteers=datetime.date(2021,5,15)))
self.nomcoms.append(NomComFactory(group__acronym='nomcom2022', populate_personnel=False, first_call_for_volunteers=datetime.date(2022,5,15)))
# make_immutable_test_data makes things this test does not want # make_immutable_test_data makes things this test does not want
Role.objects.filter(name_id__in=('chair','secr')).delete() Role.objects.filter(name_id__in=('chair','secr')).delete()
def test_elig_by_meetings(self): def test_elig_by_meetings(self):
meetings = [MeetingFactory(number=number, date=date, type_id='ietf') for number,date in [ meetings = [MeetingFactory(number=number, date=date, type_id='ietf') for number,date in [
('112', datetime.date(2021, 11, 8)),
('111', datetime.date(2021, 7, 26)),
('110', datetime.date(2021, 3, 6)), ('110', datetime.date(2021, 3, 6)),
('109', datetime.date(2020, 11, 14)), ('109', datetime.date(2020, 11, 14)),
('108', datetime.date(2020, 7, 25)), ('108', datetime.date(2020, 7, 25)),
@ -2325,163 +2329,177 @@ class rfc8989EligibilityTests(TestCase):
('106', datetime.date(2019, 11, 16)), ('106', datetime.date(2019, 11, 16)),
]] ]]
eligible_people = list() for nomcom in self.nomcoms:
ineligible_people = list() eligible_people = list()
ineligible_people = list()
for combo_len in range(0,6): prev_five = meetings[2:] if nomcom.group.acronym == 'nomcom2021' else meetings[:5]
for combo in combinations(meetings,combo_len): for combo_len in range(0,6):
p = PersonFactory() for combo in combinations(prev_five,combo_len):
for m in combo: p = PersonFactory()
MeetingRegistrationFactory(person=p, meeting=m) for m in combo:
if combo_len<3: MeetingRegistrationFactory(person=p, meeting=m)
ineligible_people.append(p) if combo_len<3:
else: ineligible_people.append(p)
eligible_people.append(p) else:
eligible_people.append(p)
self.assertEqual(set(eligible_people),set(list_eligible(self.nomcom))) self.assertEqual(set(eligible_people),set(list_eligible(nomcom)))
for person in eligible_people: for person in eligible_people:
self.assertTrue(is_eligible(person,self.nomcom)) self.assertTrue(is_eligible(person,nomcom))
for person in ineligible_people:
self.assertFalse(is_eligible(person,nomcom))
Person.objects.filter(pk__in=[p.pk for p in eligible_people+ineligible_people]).delete()
for person in ineligible_people:
self.assertFalse(is_eligible(person,self.nomcom))
def test_elig_by_office_active_groups(self): def test_elig_by_office_active_groups(self):
before_elig_date = self.nomcom.first_call_for_volunteers - datetime.timedelta(days=5)
chair = RoleFactory(name_id='chair',group__time=before_elig_date).person
secr = RoleFactory(name_id='secr',group__time=before_elig_date).person
nobody=PersonFactory() nobody=PersonFactory()
for nomcom in self.nomcoms:
before_elig_date = nomcom.first_call_for_volunteers - datetime.timedelta(days=5)
self.assertTrue(is_eligible(person=chair,nomcom=self.nomcom)) chair = RoleFactory(name_id='chair',group__time=before_elig_date).person
self.assertTrue(is_eligible(person=secr,nomcom=self.nomcom))
self.assertFalse(is_eligible(person=nobody,nomcom=self.nomcom))
self.assertEqual(set([chair,secr]), set(list_eligible(nomcom=self.nomcom))) secr = RoleFactory(name_id='secr',group__time=before_elig_date).person
self.assertTrue(is_eligible(person=chair,nomcom=nomcom))
self.assertTrue(is_eligible(person=secr,nomcom=nomcom))
self.assertFalse(is_eligible(person=nobody,nomcom=nomcom))
self.assertEqual(set([chair,secr]), set(list_eligible(nomcom=nomcom)))
Role.objects.filter(person__in=(chair,secr)).delete()
def test_elig_by_office_edge(self): def test_elig_by_office_edge(self):
elig_date=get_eligibility_date(self.nomcom) for nomcom in self.nomcoms:
day_after = elig_date + datetime.timedelta(days=1) elig_date=get_eligibility_date(nomcom)
two_days_after = elig_date + datetime.timedelta(days=2) day_after = elig_date + datetime.timedelta(days=1)
two_days_after = elig_date + datetime.timedelta(days=2)
group = GroupFactory(time=two_days_after) group = GroupFactory(time=two_days_after)
GroupHistoryFactory(group=group,time=day_after) GroupHistoryFactory(group=group,time=day_after)
after_chair = RoleFactory(name_id='chair',group=group).person after_chair = RoleFactory(name_id='chair',group=group).person
self.assertFalse(is_eligible(person=after_chair,nomcom=self.nomcom)) self.assertFalse(is_eligible(person=after_chair,nomcom=nomcom))
def test_elig_by_office_closed_groups(self): def test_elig_by_office_closed_groups(self):
elig_date=get_eligibility_date(self.nomcom) for nomcom in self.nomcoms:
day_before = elig_date-datetime.timedelta(days=1) elig_date=get_eligibility_date(nomcom)
year_before = datetime.date(elig_date.year-1,elig_date.month,elig_date.day) day_before = elig_date-datetime.timedelta(days=1)
three_years_before = datetime.date(elig_date.year-3,elig_date.month,elig_date.day) year_before = datetime.date(elig_date.year-1,elig_date.month,elig_date.day)
just_after_three_years_before = three_years_before + datetime.timedelta(days=1) three_years_before = datetime.date(elig_date.year-3,elig_date.month,elig_date.day)
just_before_three_years_before = three_years_before - datetime.timedelta(days=1) just_after_three_years_before = three_years_before + datetime.timedelta(days=1)
just_before_three_years_before = three_years_before - datetime.timedelta(days=1)
eligible = list() eligible = list()
ineligible = list() ineligible = list()
p1 = RoleHistoryFactory( p1 = RoleHistoryFactory(
name_id='chair', name_id='chair',
group__time=day_before, group__time=day_before,
group__group__state_id='conclude', group__group__state_id='conclude',
).person ).person
eligible.append(p1) eligible.append(p1)
p2 = RoleHistoryFactory( p2 = RoleHistoryFactory(
name_id='secr', name_id='secr',
group__time=year_before, group__time=year_before,
group__group__state_id='conclude', group__group__state_id='conclude',
).person ).person
eligible.append(p2) eligible.append(p2)
p3 = RoleHistoryFactory( p3 = RoleHistoryFactory(
name_id='secr', name_id='secr',
group__time=just_after_three_years_before, group__time=just_after_three_years_before,
group__group__state_id='conclude', group__group__state_id='conclude',
).person ).person
eligible.append(p3) eligible.append(p3)
p4 = RoleHistoryFactory( p4 = RoleHistoryFactory(
name_id='chair', name_id='chair',
group__time=three_years_before, group__time=three_years_before,
group__group__state_id='conclude', group__group__state_id='conclude',
).person ).person
eligible.append(p4) eligible.append(p4)
p5 = RoleHistoryFactory( p5 = RoleHistoryFactory(
name_id='chair', name_id='chair',
group__time=just_before_three_years_before, group__time=just_before_three_years_before,
group__group__state_id='conclude', group__group__state_id='conclude',
).person ).person
ineligible.append(p5) ineligible.append(p5)
for person in eligible: for person in eligible:
self.assertTrue(is_eligible(person,self.nomcom)) self.assertTrue(is_eligible(person,nomcom))
for person in ineligible: for person in ineligible:
self.assertFalse(is_eligible(person,self.nomcom)) self.assertFalse(is_eligible(person,nomcom))
self.assertEqual(set(list_eligible(nomcom=nomcom)),set(eligible))
Person.objects.filter(pk__in=[p.pk for p in eligible+ineligible]).delete()
self.assertEqual(set(list_eligible(nomcom=self.nomcom)),set(eligible))
def test_elig_by_author(self): def test_elig_by_author(self):
elig_date = get_eligibility_date(self.nomcom) for nomcom in self.nomcoms:
elig_date = get_eligibility_date(nomcom)
last_date = elig_date last_date = elig_date
first_date = datetime.date(last_date.year-5,last_date.month,last_date.day) first_date = datetime.date(last_date.year-5,last_date.month,last_date.day)
day_after_last_date = last_date+datetime.timedelta(days=1) day_after_last_date = last_date+datetime.timedelta(days=1)
day_before_first_date = first_date-datetime.timedelta(days=1) day_before_first_date = first_date-datetime.timedelta(days=1)
middle_date = datetime.date(last_date.year-3,last_date.month,last_date.day) middle_date = datetime.date(last_date.year-3,last_date.month,last_date.day)
eligible = set() eligible = set()
ineligible = set() ineligible = set()
p = PersonFactory() p = PersonFactory()
ineligible.add(p) ineligible.add(p)
p = PersonFactory() p = PersonFactory()
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='published_rfc',doc=da.document,time=middle_date) DocEventFactory(type='published_rfc',doc=da.document,time=middle_date)
ineligible.add(p) ineligible.add(p)
p = PersonFactory() p = PersonFactory()
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='iesg_approved',doc=da.document,time=last_date) DocEventFactory(type='iesg_approved',doc=da.document,time=last_date)
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='published_rfc',doc=da.document,time=first_date) DocEventFactory(type='published_rfc',doc=da.document,time=first_date)
eligible.add(p) eligible.add(p)
p = PersonFactory() p = PersonFactory()
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='iesg_approved',doc=da.document,time=middle_date) DocEventFactory(type='iesg_approved',doc=da.document,time=middle_date)
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='published_rfc',doc=da.document,time=day_before_first_date) DocEventFactory(type='published_rfc',doc=da.document,time=day_before_first_date)
ineligible.add(p) ineligible.add(p)
p = PersonFactory() p = PersonFactory()
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='iesg_approved',doc=da.document,time=day_after_last_date) DocEventFactory(type='iesg_approved',doc=da.document,time=day_after_last_date)
da = WgDocumentAuthorFactory(person=p) da = WgDocumentAuthorFactory(person=p)
DocEventFactory(type='published_rfc',doc=da.document,time=middle_date) DocEventFactory(type='published_rfc',doc=da.document,time=middle_date)
ineligible.add(p) ineligible.add(p)
for person in eligible: for person in eligible:
self.assertTrue(is_eligible(person,self.nomcom)) self.assertTrue(is_eligible(person,nomcom))
for person in ineligible: for person in ineligible:
self.assertFalse(is_eligible(person,self.nomcom)) self.assertFalse(is_eligible(person,nomcom))
self.assertEqual(set(list_eligible(nomcom=self.nomcom)),set(eligible)) self.assertEqual(set(list_eligible(nomcom=nomcom)),set(eligible))
Person.objects.filter(pk__in=[p.pk for p in eligible.union(ineligible)]).delete()
class VolunteerTests(TestCase): class VolunteerTests(TestCase):

4
ietf/nomcom/utils.py
View file

@ -495,7 +495,7 @@ def list_eligible(nomcom=None, date=None, base_qs=None):
return list_eligible_8713(date=eligibility_date, base_qs=base_qs) return list_eligible_8713(date=eligibility_date, base_qs=base_qs)
elif eligibility_date.year == 2020: elif eligibility_date.year == 2020:
return list_eligible_8788(date=eligibility_date, base_qs=base_qs) return list_eligible_8788(date=eligibility_date, base_qs=base_qs)
elif eligibility_date.year == 2021: elif eligibility_date.year in (2021,2022):
return list_eligible_8989(date=eligibility_date, base_qs=base_qs) return list_eligible_8989(date=eligibility_date, base_qs=base_qs)
else: else:
return Person.objects.none() return Person.objects.none()
@ -504,7 +504,7 @@ def decorate_volunteers_with_qualifications(volunteers, nomcom=None, date=None,
if not base_qs: if not base_qs:
base_qs = Person.objects.all() base_qs = Person.objects.all()
eligibility_date = get_eligibility_date(nomcom, date) eligibility_date = get_eligibility_date(nomcom, date)
if eligibility_date.year == 2021: if eligibility_date.year in (2021,2022):
three_of_five_qs, officer_qs, author_qs = get_8989_eligibility_querysets(eligibility_date, base_qs) three_of_five_qs, officer_qs, author_qs = get_8989_eligibility_querysets(eligibility_date, base_qs)
for v in volunteers: for v in volunteers:
qualifications = [] qualifications = []