Improved SearchablePersonField to show the primary email address for any search results where a name appears more than once.

Simplified the edit nominee form.
Replaced the merge nominee form with a request to the secretariat to merge Person records. Fixes ietf-tools#1847.
Added merging nominees to the secretariat's person merging script.
Restructured the person merging script to make it testable.
Updated some tests to match changes to the mailtriggers that hadn't made it to the fixtures.
 - Legacy-Id: 10625

Author: rjsparks

ietf/bin/merge-person-records

@@ -12,11 +12,10 @@ import django
 django.setup()
 
 import argparse
-import pprint
-from django.contrib import admin
-from django.contrib.auth.models import User
 from ietf.person.models import Person
 
+from ietf.person.utils import merge_persons
+
 parser = argparse.ArgumentParser()
 parser.add_argument("source_id",type=int)
 parser.add_argument("target_id",type=int)
@@ -30,62 +29,4 @@ response = raw_input('Ok to continue y/n? ')
 if response.lower() != 'y':
     sys.exit()
 
-# merge emails
-for email in source.email_set.all():
-    print "Merging email: {}".format(email.address)
-    email.person = target
-    email.save()
-
-# merge aliases
-target_aliases = [ a.name for a in target.alias_set.all() ]
-for alias in source.alias_set.all():
-    if alias.name in target_aliases:
-        alias.delete()
-    else:
-        print "Merging alias: {}".format(alias.name)
-        alias.person = target
-        alias.save()
-
-# merge DocEvents
-for docevent in source.docevent_set.all():
-    docevent.by = target
-    docevent.save()
-    
-# merge SubmissionEvents
-for subevent in source.submissionevent_set.all():
-    subevent.by = target
-    subevent.save()
-
-# merge Messages
-for message in source.message_set.all():
-    message.by = target
-    message.save()
-
-# merge Constraints
-for constraint in source.constraint_set.all():
-    constraint.person = target
-    constraint.save()
-
-# merge Roles
-for role in source.role_set.all():
-    role.person = target
-    role.save()
-
-# check for any remaining relationships and delete if none
-objs = [source]
-opts = Person._meta
-user = User.objects.filter(is_superuser=True).first()
-admin_site = admin.site
-using = 'default'
-
-deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
-    objs, opts, user, admin_site, using)
-    
-if len(deletable_objects) > 1:
-    print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
-    print "Related objects remain:"
-    pprint.pprint(deletable_objects[1])
-
-else:
-    print "Deleting Person: {}({})".format(source.ascii,source.pk)
-    source.delete()
+merge_persons(source,target,sys.stdout)

ietf/doc/tests_draft.py

@@ -1268,6 +1268,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.basea.documentauthor_set.create(author=Email.objects.create(address="basea_author@example.com"),order=1)
 
         self.baseb = Document.objects.create(
             name="draft-test-base-b",
@@ -1278,6 +1279,7 @@ def setUp(self):
             expires=datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.baseb.documentauthor_set.create(author=Email.objects.create(address="baseb_author@example.com"),order=1)
 
         self.replacea = Document.objects.create(
             name="draft-test-replace-a",
@@ -1288,6 +1290,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.replacea.documentauthor_set.create(author=Email.objects.create(address="replacea_author@example.com"),order=1)
 
         self.replaceboth = Document.objects.create(
             name="draft-test-replace-both",
@@ -1298,6 +1301,7 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
+        self.replaceboth.documentauthor_set.create(author=Email.objects.create(address="replaceboth_author@example.com"),order=1)
 
         self.basea.set_state(State.objects.get(used=True, type="draft", slug="active"))
         self.baseb.set_state(State.objects.get(used=True, type="draft", slug="expired"))
@@ -1332,8 +1336,8 @@ def test_change_replaces(self):
         self.assertTrue(not RelatedDocument.objects.filter(relationship='possibly-replaces', source=self.replacea))
         self.assertEqual(len(outbox), 1)
         self.assertTrue('replacement status updated' in outbox[-1]['Subject'])
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('replace-a@' in outbox[-1]['To'])
+        self.assertTrue('replacea_author@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
 
         empty_outbox()
         # Post that says replaceboth replaces both base a and base b
@@ -1344,9 +1348,9 @@ def test_change_replaces(self):
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl')
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'repl')
         self.assertEqual(len(outbox), 1)
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('base-b@' in outbox[-1]['To'])
-        self.assertTrue('replace-both@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('baseb_author@' in outbox[-1]['To'])
+        self.assertTrue('replaceboth_author@' in outbox[-1]['To'])
 
         # Post that undoes replaceboth
         empty_outbox()
@@ -1355,18 +1359,18 @@ def test_change_replaces(self):
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl') # Because A is still also replaced by replacea
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'expired')
         self.assertEqual(len(outbox), 1)
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('base-b@' in outbox[-1]['To'])
-        self.assertTrue('replace-both@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('baseb_author@' in outbox[-1]['To'])
+        self.assertTrue('replaceboth_author@' in outbox[-1]['To'])
 
         # Post that undoes replacea
         empty_outbox()
         url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replacea.name))
         r = self.client.post(url, dict(replaces=""))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'active')
-        self.assertTrue('base-a@' in outbox[-1]['To'])
-        self.assertTrue('replace-a@' in outbox[-1]['To'])
+        self.assertTrue('basea_author@' in outbox[-1]['To'])
+        self.assertTrue('replacea_author@' in outbox[-1]['To'])
 
 
     def test_review_possibly_replaces(self):

ietf/doc/utils.py

@@ -20,6 +20,8 @@
 from ietf.utils.mail import send_mail
 from ietf.mailtrigger.utils import gather_address_lists
 
+import debug              # pyflakes:ignore
+
 #TODO FIXME - it would be better if this lived in ietf/doc/mails.py, but there's
 #        an import order issue to work out.
 def email_update_telechat(request, doc, text):

ietf/mailtrigger/migrations/0003_merge_request_trigger.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+
+    Recipient=apps.get_model('mailtrigger','Recipient')
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+
+    m = MailTrigger.objects.create(
+            slug='person_merge_requested',
+            desc="Recipients for a message requesting that duplicated Person records be merged ")
+    m.to = Recipient.objects.filter(slug__in=['ietf_secretariat', ])
+
+def reverse(apps, schema_editor):
+    MailTrigger=apps.get_model('mailtrigger','MailTrigger')
+    MailTrigger.objects.filter(slug='person_merge_requested').delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailtrigger', '0002_auto_20150809_1314'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/name/fixtures/names.json

@@ -648,6 +648,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "charter",
   "used": true,
   "name": "Charter",
   "desc": ""
@@ -658,6 +659,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "agenda",
   "used": true,
   "name": "Agenda",
   "desc": ""
@@ -668,6 +670,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "minutes",
   "used": true,
   "name": "Minutes",
   "desc": ""
@@ -678,6 +681,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "slides",
   "used": true,
   "name": "Slides",
   "desc": ""
@@ -688,6 +692,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "draft",
   "used": true,
   "name": "Draft",
   "desc": ""
@@ -698,6 +703,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "liai-att",
   "used": true,
   "name": "Liaison Attachment",
   "desc": ""
@@ -708,6 +714,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "conflict-review",
   "used": true,
   "name": "Conflict Review",
   "desc": ""
@@ -718,6 +725,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "status-change",
   "used": true,
   "name": "Status Change",
   "desc": ""
@@ -728,6 +736,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "",
   "used": false,
   "name": "Shepherd's writeup",
   "desc": ""
@@ -738,6 +747,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "",
   "used": false,
   "name": "Liaison",
   "desc": ""
@@ -748,6 +758,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "recording",
   "used": true,
   "name": "Recording",
   "desc": ""
@@ -758,6 +769,7 @@
 {
  "fields": {
   "order": 0,
+  "prefix": "bluesheets",
   "used": true,
   "name": "Bluesheets",
   "desc": ""
@@ -1580,6 +1592,16 @@
  "model": "name.liaisonstatementeventtypename",
  "pk": "comment"
 },
+{
+ "fields": {
+  "order": 10,
+  "used": true,
+  "name": "Private Comment",
+  "desc": ""
+ },
+ "model": "name.liaisonstatementeventtypename",
+ "pk": "private_comment"
+},
 {
  "fields": {
   "order": 1,
@@ -4541,6 +4563,14 @@
  "model": "mailtrigger.recipient",
  "pk": "doc_authors"
 },
+{
+ "fields": {
+  "template": "{{doc.author_list}}",
+  "desc": "The authors of the document, without using the draft aliases"
+ },
+ "model": "mailtrigger.recipient",
+ "pk": "doc_authors_expanded"
+},
 {
  "fields": {
   "template": null,
@@ -4701,6 +4731,14 @@
  "model": "mailtrigger.recipient",
  "pk": "iana_last_call"
 },
+{
+ "fields": {
+  "template": "<i-d-announce@ietf.org>",
+  "desc": "The I-D-Announce Email List"
+ },
+ "model": "mailtrigger.recipient",
+ "pk": "id_announce"
+},
 {
  "fields": {
   "template": "The IESG <iesg@ietf.org>",
@@ -5306,11 +5344,7 @@
  "fields": {
   "cc": [],
   "to": [
-   "doc_authors",
-   "doc_group_chairs",
-   "doc_group_responsible_directors",
-   "doc_notify",
-   "doc_shepherd"
+   "doc_authors_expanded"
   ],
   "desc": "Recipients when what a document replaces or is replaced by changes"
  },
@@ -5698,6 +5732,17 @@
  "model": "mailtrigger.mailtrigger",
  "pk": "nomination_received"
 },
+{
+ "fields": {
+  "cc": [],
+  "to": [
+   "ietf_secretariat"
+  ],
+  "desc": "Recipients for a message requesting that duplicated Person records be merged "
+ },
+ "model": "mailtrigger.mailtrigger",
+ "pk": "person_merge_requested"
+},
 {
  "fields": {
   "cc": [
@@ -5843,7 +5888,7 @@
    "submission_group_mail_list"
   ],
   "to": [
-   "ietf_announce"
+   "id_announce"
   ],
   "desc": "Recipients for the announcement of a successfully submitted draft"
  },