Change auth model for new schema to use Person rather than Email where email is not necessary, use Person for user profiles rather than the old unused profile class, use REMOTE_USER backend directly instead of custom backend, use group roles for authorization rather than Django groups, port/proxy code from using IESGLogin to the new model

 - Legacy-Id: 3151

Author: OleLaursen

ietf/announcements/models.py

@@ -88,15 +88,15 @@ class Meta:
         db_table = 'scheduled_announcements'
 
 
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+if settings.USE_DB_REDESIGN_PROXY_CLASSES or hasattr(settings, "IMPORTING_ANNOUNCEMENTS"):
     import datetime
 
-    from person.models import Email
+    from person.models import Email, Person
     from group.models import Group
 
     class Message(models.Model):
         time = models.DateTimeField(default=datetime.datetime.now)
-        by = models.ForeignKey(Email)
+        by = models.ForeignKey(Person)
 
         subject = models.CharField(max_length=255)
         frm = models.CharField(max_length=255)
@@ -116,7 +116,8 @@ def __unicode__(self):
 
     class SendQueue(models.Model):
         time = models.DateTimeField(default=datetime.datetime.now)
-        by = models.ForeignKey(Email)
+        by = models.ForeignKey(Person)
+        
         comment = models.TextField()
         message = models.ForeignKey(Message)
         send_at = models.DateTimeField(blank=True, null=True)

ietf/announcements/views.py

@@ -35,7 +35,6 @@ def nomcom(request):
                                 'regimes' : regimes })
 
 def nomcomREDESIGN(request):
-    from person.models import Email
     from group.models import Group
     from ietf.announcements.models import Message
 
@@ -75,7 +74,6 @@ def nomcomREDESIGN(request):
 
 
 def message_detail(request, object_id, queryset):
-    from person.models import Email
     from group.models import Group
     from ietf.announcements.models import Message
 

ietf/idrfc/expire.py

@@ -11,7 +11,7 @@
 from ietf.idrfc.utils import log_state_changed, add_document_comment
 from doc.models import Document, Event, save_document_in_history
 from name.models import IesgDocStateName, DocStateName, DocInfoTagName
-from person.models import Email
+from person.models import Person, Email
 
 INTERNET_DRAFT_DAYS_TO_EXPIRE = 185
 
@@ -186,7 +186,7 @@ def move_file(f):
         add_document_comment(None, doc, "Document is expired by system")
 
 def expire_idREDESIGN(doc):
-    system_email = Email.objects.get(address="(System)")
+    system = Person.objects.get(name="(System)")
 
     # clean up files
     def move_file(f):
@@ -219,9 +219,9 @@ def move_file(f):
         if doc.iesg_state != dead_state:
             prev = doc.iesg_state
             doc.iesg_state = dead_state
-            log_state_changed(None, doc, system_email, prev)
+            log_state_changed(None, doc, system, prev)
 
-        e = Event(doc=doc, by=system_email)
+        e = Event(doc=doc, by=system)
         e.type = "expired_document"
         e.desc = "Document has expired"
         e.save()

ietf/idrfc/idrfc_wrapper.py

@@ -641,16 +641,16 @@ def _init(self):
             self.old_init()
             return
 
-        from redesign.person.models import Email
-        active_ads = Email.objects.filter(role__name="ad", role__group__state="active")
+        from redesign.person.models import Person
+        active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
 
         positions = []
         seen = {}
 
         from doc.models import BallotPositionEvent
 	for pos in BallotPositionEvent.objects.filter(doc=self.ballot, type="changed_ballot_position", time__gte=self.ballot.process_start, time__lte=self.ballot.process_end).select_related('ad').order_by("-time", '-id'):
             if pos.ad not in seen:
-                p = dict(ad_name=pos.ad.get_name(),
+                p = dict(ad_name=pos.ad.name,
                          ad_username=pos.ad.pk, # ought to rename this in doc_ballot_list
                          position=pos.pos.name,
                          is_old_ad=pos.ad not in active_ads,
@@ -684,7 +684,7 @@ def _init(self):
         if self.ballot_active:
             for ad in active_ads:
                 if ad not in seen:
-                    d = dict(ad_name=ad.get_name(),
+                    d = dict(ad_name=ad.name,
                              ad_username=ad.pk,
                              position="No Record",
                              )

ietf/idrfc/lastcall.py

@@ -4,13 +4,13 @@
 
 from django.conf import settings
 
-from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
+from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
 
 from doc.models import Document, Event, LastCallEvent, WriteupEvent, save_document_in_history
 from name.models import IesgDocStateName
-from person.models import Email
+from person.models import Person
 
 def request_last_call(request, doc):
     try:
@@ -33,9 +33,9 @@ def request_last_callREDESIGN(request, doc):
 
     e = Event()
     e.type = "requested_last_call"
-    e.by = request.user.get_profile().email()
+    e.by = request.user.get_profile()
     e.doc = doc
-    e.desc = "Last call was requested by %s" % e.by.get_name()
+    e.desc = "Last call was requested by %s" % e.by.name
     e.save()
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
@@ -83,7 +83,7 @@ def expire_last_callREDESIGN(doc):
 
     prev = doc.iesg_state
     doc.iesg_state = state
-    e = log_state_changed(None, doc, Email.objects.get(address="(System)"), prev)
+    e = log_state_changed(None, doc, Person.objects.get(name="(System)"), prev)
 
     doc.time = e.time
     doc.save()

ietf/idrfc/mails.py

@@ -10,7 +10,7 @@
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.idtracker.models import *
 from doc.models import WriteupEvent, BallotPositionEvent, LastCallEvent
-from person.models import Email
+from person.models import Person
 
 def email_state_changed(request, doc, text):
     to = [x.strip() for x in doc.idinternal.state_change_notice_to.replace(';', ',').split(',')]
@@ -55,7 +55,7 @@ def email_ownerREDESIGN(request, doc, owner, changed_by, text, subject=None):
     to = owner.formatted_email()
     send_mail(request, to,
               "DraftTracker Mail System <iesg-secretary@ietf.org>",
-              "%s updated by %s" % (doc.file_tag(), changed_by.get_name()),
+              "%s updated by %s" % (doc.file_tag(), changed_by.name),
               "idrfc/change_notice.txt",
               dict(text=html_to_text(text),
                    doc=doc,
@@ -88,9 +88,9 @@ def full_intended_status(intended_status):
 def generate_ballot_writeup(request, doc):
     e = WriteupEvent()
     e.type = "changed_ballot_writeup_text"
-    e.by = request.user.get_profile().email()
+    e.by = request.user.get_profile()
     e.doc = doc
-    e.desc = u"Ballot writeup was generated by %s" % e.by.get_name()
+    e.desc = u"Ballot writeup was generated by %s" % e.by.name
     e.text = unicode(render_to_string("idrfc/ballot_writeup.txt"))
     e.save()
 
@@ -160,9 +160,9 @@ def generate_last_call_announcementREDESIGN(request, doc):
 
     e = WriteupEvent()
     e.type = "changed_last_call_text"
-    e.by = request.user.get_profile().email()
+    e.by = request.user.get_profile()
     e.doc = doc
-    e.desc = u"Last call announcement was generated by %s" % e.by.get_name()
+    e.desc = u"Last call announcement was generated by %s" % e.by.name
     e.text = unicode(mail)
     e.save()
 
@@ -255,9 +255,9 @@ def generate_approval_mailREDESIGN(request, doc):
 
     e = WriteupEvent()
     e.type = "changed_ballot_approval_text"
-    e.by = request.user.get_profile().email()
+    e.by = request.user.get_profile()
     e.doc = doc
-    e.desc = u"Ballot approval text was generated by %s" % e.by.get_name()
+    e.desc = u"Ballot approval text was generated by %s" % e.by.name
     e.text = unicode(mail)
     e.save()
 
@@ -292,12 +292,12 @@ 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 = Email.objects.filter(role__group__role__email=director, role__group__role__name="ad").exclude(pk=director.pk)
+    other_director = Person.objects.filter(email__role__group__role__email__person=director, email__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.get_name(), other_director[0].get_name())
+        contacts = "The IESG contact persons are %s and %s." % (director.name, other_director[0].name)
     else:
-        contacts = "The IESG contact person is %s." % director.get_name()
+        contacts = "The IESG contact person is %s." % director.name
 
     doc_type = "RFC" if doc.state_id == "rfc" else "Internet Draft"
 
@@ -476,7 +476,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 = Email.objects.filter(role__name="ad", role__group__state="active")
+    active_ads = Person.objects.filter(email__role__name="ad", email__role__group__state="active").distinct()
 
     e = doc.latest_event(type="started_iesg_process")
     positions = BallotPositionEvent.objects.filter(doc=doc, type="changed_ballot_position", time__gte=e.time).order_by("-time", '-id').select_related('ad')
@@ -499,7 +499,7 @@ def formatted(val):
                 return "[   ]"
 
         fmt = u"%-21s%-10s%-11s%-9s%-10s" % (
-            p.ad.get_name()[:21],
+            p.ad.name[:21],
             formatted(p.pos_id == "yes"),
             formatted(p.pos_id == "noobj"),
             formatted(p.pos_id == "discuss"),
@@ -517,7 +517,7 @@ def formatted(val):
 
     active_ad_positions.sort()
     inactive_ad_positions.sort()
-    ad_feedback.sort(key=lambda p: p.ad.get_name())
+    ad_feedback.sort(key=lambda p: p.ad.name)
 
     e = doc.latest_event(LastCallEvent, type="sent_last_call")
     last_call_expires = e.expires if e else None

ietf/idrfc/mirror_rfc_index.py

@@ -178,13 +178,13 @@ def get_stream_mapping():
 
 @django.db.transaction.commit_on_success
 def insert_to_databaseREDESIGN(data):
-    from person.models import Email
+    from person.models import Person
     from doc.models import Document, DocAlias, Event, RelatedDocument
     from group.models import Group
     from name.models import DocInfoTagName, DocRelationshipName
     from name.utils import name
 
-    system_email = Email.objects.get(address="(System)")
+    system = Person.objects.get(name="(System)")
     std_level_mapping = get_std_level_mapping()
     stream_mapping = get_stream_mapping()
     tag_has_errata = name(DocInfoTagName, 'errata', "Has errata")
@@ -203,7 +203,8 @@ def insert_to_databaseREDESIGN(data):
 
         # we assume two things can happen: we get a new RFC, or an
         # attribute has been updated at the RFC Editor (RFC Editor
-        # attributes currently take precedence)
+        # attributes currently take precedence over our local
+        # attributes)
 
         # make sure we got the document and alias
         created = False
@@ -257,7 +258,7 @@ def insert_to_databaseREDESIGN(data):
         if not doc.latest_event(type="published_rfc", time=pubdate):
             e = Event(doc=doc, type="published_rfc")
             e.time = pubdate
-            e.by = system_email
+            e.by = system
             e.desc = "RFC published"
             e.save()
             changed = True

ietf/idrfc/templatetags/ballot_icon.py

@@ -42,16 +42,20 @@
 def get_user_adid(context):
     if 'user' in context and in_group(context['user'], "Area_Director"):
         if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            # with the new design, we need the email address (FIXME:
-            # we shouldn't go through the old classes though,
-            # IESGLogin needs revamping)
-            return context['user'].get_profile().person().email()[1]
+            return context['user'].get_profile().id
         return context['user'].get_profile().iesg_login_id()
     else:
         return None
 
 def get_user_name(context):
     if 'user' in context and context['user'].is_authenticated():
+        if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+            from person.models import Person
+            try:
+                return context['user'].get_profile().name
+            except Person.DoesNotExist:
+                return None
+
         person = context['user'].get_profile().person()
         if person:
             return str(person)