Add person foreign key on Role to link the role and person directly instead of through Email, this will allow us to use non-personal emails on roles

 - Legacy-Id: 3418

Author: OleLaursen

ietf/announcements/views.py

@@ -52,7 +52,7 @@ def nomcomREDESIGN(request):
         e = n.latest_event(type="concluded")
         n.end_year = e.time.year if e else ""
 
-        chair = n.role_set.get(name="chair").email
+        chair = n.role_set.get(name="chair").person
         announcements = Message.objects.filter(related_groups=n).order_by('-time')
         for a in announcements:
             a.to_name = address_re.sub("", a.to)

ietf/idrfc/idrfc_wrapper.py

@@ -710,7 +710,7 @@ def _init(self):
             return
 
         from redesign.person.models import Person
-        active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
+        active_ads = Person.objects.filter(role__name="ad", role__group__state="active").distinct()
 
         positions = []
         seen = {}

ietf/idrfc/mails.py

@@ -313,7 +313,7 @@ def generate_approval_mail_approved(request, doc):
         made_by = "This document is the product of the %s." % doc.group.name_with_wg
 
     director = doc.ad
-    other_director = Person.objects.filter(email__role__group__role__email__person=director, email__role__group__role__name="ad").exclude(pk=director.pk)
+    other_director = Person.objects.filter(role__group__role__person=director, role__group__role__name="ad").exclude(pk=director.pk)
 
     if doc.group.type_id != "individ" and other_director:
         contacts = "The IESG contact persons are %s and %s." % (director.name, other_director[0].name)
@@ -497,7 +497,7 @@ def generate_issue_ballot_mailREDESIGN(request, doc):
     full_status = full_intended_status(doc.intended_std_level.name)
     status = full_status.replace("a ", "").replace("an ", "")
 
-    active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
+    active_ads = Person.objects.filter(role__name="ad", role__group__state="active").distinct()
 
     e = doc.latest_event(type="started_iesg_process")
     positions = BallotPositionDocEvent.objects.filter(doc=doc, type="changed_ballot_position", time__gte=e.time).order_by("-time", '-id').select_related('ad')

ietf/idrfc/views_edit.py

@@ -382,7 +382,7 @@ class EditInfoFormREDESIGN(forms.Form):
     intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.all(), empty_label=None, required=True)
     status_date = forms.DateField(required=False, help_text="Format is YYYY-MM-DD")
     via_rfc_editor = forms.BooleanField(required=False, label="Via IRTF or RFC Editor")
-    ad = forms.ModelChoiceField(Person.objects.filter(email__role__name="ad", email__role__group__state="active").order_by('name'), label="Responsible AD", empty_label=None, required=True)
+    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), label="Responsible AD", empty_label=None, required=True)
     create_in_state = forms.ModelChoiceField(IesgDocStateName.objects.filter(slug__in=("pub-req", "watching")), empty_label=None, required=True)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
     note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)

ietf/idrfc/views_search.py

@@ -298,9 +298,9 @@ class SearchForm(forms.Form):
         def __init__(self, *args, **kwargs):
             super(SearchForm, self).__init__(*args, **kwargs)
             responsible = Document.objects.values_list('ad', flat=True).distinct()
-            active_ads = list(Person.objects.filter(email__role__name="ad",
-                                                    email__role__group__type="area",
-                                                    email__role__group__state="active").distinct())
+            active_ads = list(Person.objects.filter(role__name="ad",
+                                                    role__group__type="area",
+                                                    role__group__state="active").distinct())
             inactive_ads = list(Person.objects.filter(pk__in=responsible)
                                 .exclude(pk__in=[x.pk for x in active_ads]))
             extract_last_name = lambda x: x.name_parts()[3]
@@ -382,8 +382,8 @@ def add(allow, states):
             docs = docs.filter(group__acronym=query["group"])
         elif by == "area":
             docs = docs.filter(Q(group__parent=query["area"]) |
-                               Q(ad__email__role__name="ad",
-                                 ad__email__role__group=query["area"]))
+                               Q(ad__role__name="ad",
+                                 ad__role__group=query["area"]))
         elif by == "ad":
             docs = docs.filter(ad=query["ad"])
         elif by == "state":
@@ -571,9 +571,9 @@ def by_ad(request, name):
     ad_name = None
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         responsible = Document.objects.values_list('ad', flat=True).distinct()
-        for p in Person.objects.filter(Q(email__role__name="ad",
-                                         email__role__group__type="area",
-                                         email__role__group__state="active")
+        for p in Person.objects.filter(Q(role__name="ad",
+                                         role__group__type="area",
+                                         role__group__state="active")
                                        | Q(pk__in=responsible)):
             if name == p.name.lower().replace(" ", "."):
                 ad_id = p.id

ietf/idtracker/models.py

@@ -1060,6 +1060,7 @@ class Role(models.Model):
     IAB_EXCUTIVE_DIRECTOR = 4
     IRTF_CHAIR            = 5
     IAD_CHAIR             = 6
+    RSOC_CHAIR            = 7
 
     # This __str__ makes it odd to use as a ForeignKey.
     def __str__(self):

ietf/ietfauth/decorators.py

@@ -84,8 +84,8 @@ def has_role(user, role_names):
         return False
 
     role_qs = {
-        "Area Director": Q(email__person=person, name="ad", group__state="active"),
-        "Secretariat": Q(email__person=person, name="secr", group__acronym="secretariat")
+        "Area Director": Q(person=person, name="ad", group__type="area", group__state="active"),
+        "Secretariat": Q(person=person, name="secr", group__acronym="secretariat")
         }
 
     filter_expr = Q()
@@ -108,4 +108,5 @@ def decorate(view_func):
     return decorate
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    # overwrite group_required
     group_required = lambda *group_names: role_required(*[n.replace("Area_Director", "Area Director") for n in group_names])

ietf/ietfauth/views.py

@@ -77,7 +77,7 @@ def profile(request):
         person = None
         try:
             person = request.user.get_profile()
-            roles = Role.objects.filter(email__person=person).distinct()
+            roles = Role.objects.filter(person=person)
         except Person.DoesNotExist:
             pass
 

ietf/ietfworkflows/accounts.py

@@ -21,14 +21,14 @@ def is_wgchair(person):
     return bool(person.wgchair_set.all())
 
 def is_wgchairREDESIGN(person):
-    return bool(Role.objects.filter(name="chair", group__type="wg", group__state="active", email__person=person))
+    return bool(Role.objects.filter(name="chair", group__type="wg", group__state="active", person=person))
 
 
 def is_wgdelegate(person):
     return bool(person.wgdelegate_set.all())
 
 def is_delegateREDESIGN(person):
-    return bool(Role.objects.filter(name="delegate", group__type="wg", group__state="active", email__person=person))
+    return bool(Role.objects.filter(name="delegate", group__type="wg", group__state="active", person=person))
 
 
 def is_chair_of_draft(user, draft):
@@ -47,7 +47,7 @@ def is_chair_of_draftREDESIGN(user, draft):
     if not user.is_authenticated() or not user.get_profile() or not draft.group:
         return False
 
-    return bool(Role.objects.filter(name="chair", group=draft.group, email__person=user.get_profile()))
+    return bool(Role.objects.filter(name="chair", group=draft.group, person=user.get_profile()))
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
     from ietf.wgchairs.accounts import is_secretariat, get_person_for_user 

ietf/liaisons/accountsREDESIGN.py

@@ -43,27 +43,27 @@ def get_person_for_user(user):
 
 
 def is_areadirector(person):
-    return bool(Role.objects.filter(email__person=person, name="ad", group__state="active", group__type="area"))
+    return bool(Role.objects.filter(person=person, name="ad", group__state="active", group__type="area"))
 
 
 def is_wgchair(person):
-    return bool(Role.objects.filter(email__person=person, name="chair", group__state="active", group__type="wg"))
+    return bool(Role.objects.filter(person=person, name="chair", group__state="active", group__type="wg"))
 
 
 def is_wgsecretary(person):
-    return bool(Role.objects.filter(email__person=person, name="sec", group__state="active", group__type="wg"))
+    return bool(Role.objects.filter(person=person, name="sec", group__state="active", group__type="wg"))
 
 
 def is_ietfchair(person):
-    return bool(Role.objects.filter(email__person=person, name="chair", group__acronym="ietf"))
+    return bool(Role.objects.filter(person=person, name="chair", group__acronym="ietf"))
 
 
 def is_iabchair(person):
-    return bool(Role.objects.filter(email__person=person, name="chair", group__acronym="iab"))
+    return bool(Role.objects.filter(person=person, name="chair", group__acronym="iab"))
 
 
 def is_iab_executive_director(person):
-    return bool(Role.objects.filter(email__person=person, name="execdir", group__acronym="iab"))
+    return bool(Role.objects.filter(person=person, name="execdir", group__acronym="iab"))
 
 
 def can_add_outgoing_liaison(user):
@@ -80,15 +80,15 @@ def can_add_outgoing_liaison(user):
 
 
 def is_sdo_liaison_manager(person):
-    return bool(Role.objects.filter(email__person=person, name="liaiman", group__type="sdo"))
+    return bool(Role.objects.filter(person=person, name="liaiman", group__type="sdo"))
 
 
 def is_sdo_authorized_individual(person):
-    return bool(Role.objects.filter(email__person=person, name="auth", group__type="sdo"))
+    return bool(Role.objects.filter(person=person, name="auth", group__type="sdo"))
 
 
 def is_secretariat(user):
-    return user.is_authenticated() and bool(Role.objects.filter(email__person__user=user, name="secr", group__acronym="secretariat"))
+    return user.is_authenticated() and bool(Role.objects.filter(person__user=user, name="secr", group__acronym="secretariat"))
 
 
 def can_add_incoming_liaison(user):
@@ -109,13 +109,13 @@ def can_add_liaison(user):
 
 def is_sdo_manager_for_outgoing_liaison(person, liaison):
     if liaison.from_group and liaison.from_group.type_id == "sdo":
-        return bool(liaison.from_group.role_set.filter(name="liaiman", email__person=person))
+        return bool(liaison.from_group.role_set.filter(name="liaiman", person=person))
     return False
 
 
 def is_sdo_manager_for_incoming_liaison(person, liaison):
     if liaison.to_group and liaison.to_group.type_id == "sdo":
-        return bool(liaison.to_group.role_set.filter(name="liaiman", email__person=person))
+        return bool(liaison.to_group.role_set.filter(name="liaiman", person=person))
     return False