From 84e8daffaaf8ea3a6c31635fe8894aaa83e7a931 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 12 Jan 2023 12:22:47 -0600 Subject: [PATCH] feat: chair aliases for research area groups (#4966) --- ietf/group/management/commands/generate_group_aliases.py | 6 +++--- ietf/group/tests.py | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ietf/group/management/commands/generate_group_aliases.py b/ietf/group/management/commands/generate_group_aliases.py index 2610ba5ad..484574a67 100755 --- a/ietf/group/management/commands/generate_group_aliases.py +++ b/ietf/group/management/commands/generate_group_aliases.py @@ -26,8 +26,8 @@ from ietf.utils.aliases import dump_sublist DEFAULT_YEARS = 5 ACTIVE_STATES=['active', 'bof', 'proposed'] -GROUP_TYPES=['wg', 'rg', 'dir', 'team', 'review', 'program', 'rfcedtyp'] -NO_AD_GROUP_TYPES=['rg', 'team', 'program', 'rfcedtyp'] +GROUP_TYPES=['wg', 'rg', 'rag', 'dir', 'team', 'review', 'program', 'rfcedtyp'] +NO_AD_GROUP_TYPES=['rg', 'rag', 'team', 'program', 'rfcedtyp'] IETF_DOMAIN=['ietf.org', ] IRTF_DOMAIN=['irtf.org', ] IAB_DOMAIN=['iab.org', ] @@ -61,7 +61,7 @@ class Command(BaseCommand): for g in GROUP_TYPES: domains = [] domains += IETF_DOMAIN - if g == 'rg': + if g in ('rg', 'rag'): domains += IRTF_DOMAIN if g == 'program': domains += IAB_DOMAIN diff --git a/ietf/group/tests.py b/ietf/group/tests.py index 2c63ff95d..532f599a3 100644 --- a/ietf/group/tests.py +++ b/ietf/group/tests.py @@ -142,6 +142,9 @@ class GenerateGroupAliasesTests(TestCase): testrg = GroupFactory(type_id='rg', acronym='testrg', parent=irtf) testrgchair = PersonFactory(user__username='testrgchair') testrg.role_set.create(name_id='chair', person=testrgchair, email=testrgchair.email()) + testrag = GroupFactory(type_id='rg', acronym='testrag', parent=irtf) + testragchair = PersonFactory(user__username='testragchair') + testrag.role_set.create(name_id='chair', person=testragchair, email=testragchair.email()) individual = PersonFactory() args = [ ] @@ -184,6 +187,7 @@ class GenerateGroupAliasesTests(TestCase): ameschair.email_address(), recentchair.email_address(), testrgchair.email_address(), + testragchair.email_address(), ]])) self.assertFalse(all([x in vcontent for x in [ done_ad.email_address(), @@ -200,8 +204,11 @@ class GenerateGroupAliasesTests(TestCase): 'xfilter-' + recent.acronym + '-ads', 'xfilter-' + recent.acronym + '-chairs', 'xfilter-' + testrg.acronym + '-chairs', + 'xfilter-' + testrag.acronym + '-chairs', testrg.acronym + '-chairs@ietf.org', testrg.acronym + '-chairs@irtf.org', + testrag.acronym + '-chairs@ietf.org', + testrag.acronym + '-chairs@irtf.org', ]])) self.assertFalse(all([x in vcontent for x in [ 'xfilter-' + done.acronym + '-ads',