tightened edge for group office rule

rjsparks · rjsparks · commit bcc280fe9ba2 · 2021-05-06T13:51:29.000Z
- Legacy-Id: 18972
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
@@ -24,7 +24,7 @@
 from ietf.dbtemplate.factories import DBTemplateFactory
 from ietf.dbtemplate.models import DBTemplate
 from ietf.doc.factories import DocEventFactory, WgDocumentAuthorFactory
-from ietf.group.factories import RoleFactory, RoleHistoryFactory
+from ietf.group.factories import GroupFactory, GroupHistoryFactory, RoleFactory, RoleHistoryFactory
 from ietf.group.models import Group, Role
 from ietf.meeting.factories import MeetingFactory
 from ietf.message.models import Message
@@ -2302,8 +2302,19 @@ def test_elig_by_office_active_groups(self):
 
         self.assertEqual(set([chair,secr]), set(list_eligible(nomcom=self.nomcom)))
 
-    # Current implementation of 8989 rule 2 has an edge case bug
-    # If someone was made a wg officer after the elgibility date proscribed by rfc8989, they will still be counted as eligible.
+
+    def test_elig_by_office_edge(self):
+
+        elig_date=get_eligibility_date(self.nomcom)
+        day_after = elig_date + datetime.timedelta(days=1)
+        two_days_after = elig_date + datetime.timedelta(days=2)
+
+        group = GroupFactory(time=two_days_after)
+        GroupHistoryFactory(group=group,time=day_after)
+
+        after_chair = RoleFactory(name_id='chair',group=group).person
+
+        self.assertFalse(is_eligible(person=after_chair,nomcom=self.nomcom))
 
 
     def test_elig_by_office_closed_groups(self):
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
@@ -521,9 +521,11 @@ def list_eligible_8989(date, base_qs=None):
         Q(role__name_id__in=('chair','secr'),
           role__group__state_id='active',
           role__group__type_id='wg',
+          role__group__time__lte=date,
         ) 
         # was an officer since the given date (I think this is wrong - it looks at when roles _start_, not when roles end)
       | Q(rolehistory__group__time__gte=three_years_ago,
+          rolehistory__group__time__lte=date,
           rolehistory__name_id__in=('chair','secr'),
           rolehistory__group__state_id='active',
           rolehistory__group__type_id='wg',
