Added origin information to all places where we create email address entries.

 - Legacy-Id: 15127

Author: levkowetz

ietf/doc/tests_draft.py

@@ -1001,7 +1001,7 @@ def test_doc_change_shepherd_email(self):
         doc.shepherd = Email.objects.get(person__user__username="plain")
         doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
-        new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person)
+        new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person, origin='test')
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -1436,7 +1436,7 @@ def setUp(self):
             group=mars_wg,
         )
         p = Person.objects.create(name="basea_author")
-        e = Email.objects.create(address="basea_author@example.com", person=p)
+        e = Email.objects.create(address="basea_author@example.com", person=p, origin='test')
         self.basea.documentauthor_set.create(person=p, email=e, order=1)
 
         self.baseb = Document.objects.create(
@@ -1449,7 +1449,7 @@ def setUp(self):
             group=mars_wg,
         )
         p = Person.objects.create(name="baseb_author")
-        e = Email.objects.create(address="baseb_author@example.com", person=p)
+        e = Email.objects.create(address="baseb_author@example.com", person=p, origin='test')
         self.baseb.documentauthor_set.create(person=p, email=e, order=1)
 
         self.replacea = Document.objects.create(
@@ -1462,7 +1462,7 @@ def setUp(self):
             group=mars_wg,
         )
         p = Person.objects.create(name="replacea_author")
-        e = Email.objects.create(address="replacea_author@example.com", person=p)
+        e = Email.objects.create(address="replacea_author@example.com", person=p, origin='test')
         self.replacea.documentauthor_set.create(person=p, email=e, order=1)
 
         self.replaceboth = Document.objects.create(
@@ -1475,7 +1475,7 @@ def setUp(self):
             group=mars_wg,
         )
         p = Person.objects.create(name="replaceboth_author")
-        e = Email.objects.create(address="replaceboth_author@example.com", person=p)
+        e = Email.objects.create(address="replaceboth_author@example.com", person=p, origin='test')
         self.replaceboth.documentauthor_set.create(person=p, email=e, order=1)
 
         self.basea.set_state(State.objects.get(used=True, type="draft", slug="active"))

ietf/ietfauth/tests.py

@@ -308,7 +308,7 @@ def test_reset_password(self):
         user.set_password("forgotten")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
+        Email.objects.create(address=user.username, person=p, origin='test')
 
         # get
         r = self.client.get(url)
@@ -418,7 +418,7 @@ def test_change_password(self):
         user.set_password("password")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
+        Email.objects.create(address=user.username, person=p, origin='test')
 
         # log in
         r = self.client.post(redir_url, {"username":user.username, "password":"password"})
@@ -465,8 +465,8 @@ def test_change_username(self):
         user.set_password("password")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
-        Email.objects.create(address="othername@example.org", person=p)        
+        Email.objects.create(address=user.username, person=p, origin='test')
+        Email.objects.create(address="othername@example.org", person=p, origin='test')
 
         # log in
         r = self.client.post(redir_url, {"username":user.username, "password":"password"})

ietf/ietfauth/views.py

@@ -172,7 +172,7 @@ def confirm_account(request, auth):
                     Alias.objects.create(person=person, name=name)
 
             if not email_obj:
-                email_obj = Email.objects.create(address=email, person=person)
+                email_obj = Email.objects.create(address=email, person=person, origin=user.username)
             else:
                 if not email_obj.person:
                     email_obj.person = person
@@ -293,7 +293,7 @@ def confirm_new_email(request, auth):
     can_confirm = form.is_valid() and email
     new_email_obj = None
     if request.method == 'POST' and can_confirm and request.POST.get("action") == "confirm":
-        new_email_obj = Email.objects.create(address=email, person=person)
+        new_email_obj = Email.objects.create(address=email, person=person, origin=username)
 
     return render(request, 'registration/confirm_new_email.html', {
         'username': username,

ietf/nomcom/management/commands/make_dummy_nomcom.py

@@ -39,18 +39,18 @@ def handle(self, *args, **options):
                                                                   populate_personnel=False,
                                                                   populate_positions=False))
 
-                e = EmailFactory(person__name=u'Dummy Chair',address=u'dummychair@example.com',person__user__username=u'dummychair',person__default_emails=False)
+                e = EmailFactory(person__name=u'Dummy Chair', address=u'dummychair@example.com', person__user__username=u'dummychair', person__default_emails=False, origin='test')
                 e.person.user.set_password('password')
                 e.person.user.save()
                 nc.group.role_set.create(name_id=u'chair',person=e.person,email=e)
 
-                e = EmailFactory(person__name=u'Dummy Member',address=u'dummymember@example.com',person__user__username=u'dummymember',person__default_emails=False)
+                e = EmailFactory(person__name=u'Dummy Member', address=u'dummymember@example.com', person__user__username=u'dummymember', person__default_emails=False, origin='test')
                 e.person.user.set_password('password')
                 e.person.user.save()
                 nc.group.role_set.create(name_id=u'member',person=e.person,email=e)
 
 
-                e = EmailFactory(person__name=u'Dummy Candidate',address=u'dummycandidate@example.com',person__user__username=u'dummycandidate',person__default_emails=False)
+                e = EmailFactory(person__name=u'Dummy Candidate', address=u'dummycandidate@example.com', person__user__username=u'dummycandidate', person__default_emails=False, origin='test')
                 e.person.user.set_password('password')
                 e.person.user.save()
                 NomineePositionFactory(nominee__nomcom=nc, nominee__person=e.person,

ietf/nomcom/test_data.py

@@ -123,7 +123,7 @@ def nomcom_test_data():
         u.set_password(COMMUNITY_USER+"+password")
         u.save()
     plainman, _ = Person.objects.get_or_create(name="Plain Man", ascii="Plain Man", user=u)
-    email, _ = Email.objects.get_or_create(address="plain@example.com", person=plainman)
+    email, _ = Email.objects.get_or_create(address="plain@example.com", person=plainman, origin='test')
     nominee, _ = Nominee.objects.get_or_create(email=email, nomcom=nomcom)
 
     # positions

ietf/nomcom/tests.py

@@ -576,7 +576,7 @@ def nominate_view(self, *args, **kwargs):
         if not searched_email:
             searched_email = Email.objects.filter(address=nominee_email).first() 
             if not searched_email:
-                searched_email = EmailFactory(address=nominee_email,primary=True)
+                searched_email = EmailFactory(address=nominee_email, primary=True, origin='test')
         if not searched_email.person:
             searched_email.person = PersonFactory()
             searched_email.save()
@@ -967,8 +967,8 @@ def setUp(self):
         today = datetime.date.today()
         t_minus_3 = today - datetime.timedelta(days=3)
         t_minus_4 = today - datetime.timedelta(days=4)
-        e1 = EmailFactory(address="nominee1@example.org",person=PersonFactory(name=u"Nominee 1"))
-        e2 = EmailFactory(address="nominee2@example.org",person=PersonFactory(name=u"Nominee 2"))
+        e1 = EmailFactory(address="nominee1@example.org", person=PersonFactory(name=u"Nominee 1"), origin='test')
+        e2 = EmailFactory(address="nominee2@example.org", person=PersonFactory(name=u"Nominee 2"), origin='test')
         n = make_nomineeposition(self.nomcom,e1.person,gen,None)
         np = n.nomineeposition_set.get(position=gen)
         np.time = t_minus_3
@@ -1716,7 +1716,7 @@ def test_edit_invalid_position(self):
 
     def test_edit_nominee(self):
         nominee = self.nc.nominee_set.order_by('pk').first()
-        new_email = EmailFactory(person=nominee.person)
+        new_email = EmailFactory(person=nominee.person, origin='test')
         url = reverse('ietf.nomcom.views.edit_nominee',kwargs={'year':self.nc.year(),'nominee_id':nominee.id})
         login_testing_unauthorized(self,self.chair.user.username,url)
         response = self.client.get(url)

ietf/nomcom/utils.py

@@ -372,7 +372,7 @@ def make_nomineeposition(nomcom, candidate, position, author):
 def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email, position, author):
 
     # This is expected to fail if called with an existing email address
-    email = Email.objects.create(address=candidate_email)
+    email = Email.objects.create(address=candidate_email, origin=nomcom.group.acronym)
     person = Person.objects.create(name=candidate_name,
                                    ascii=unidecode_name(candidate_name),
                                    )

ietf/person/factories.py

@@ -71,7 +71,7 @@ def default_emails(obj, create, extracted, **kwargs): # pylint: disable=no-self-
             extracted = True
         if create and extracted:
             make_email = getattr(EmailFactory, 'create' if create else 'build')
-            make_email(person=obj,address=obj.user.email)
+            make_email(person=obj, address=obj.user.email, origin='test')
 
     @factory.post_generation
     def default_photo(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
@@ -131,4 +131,4 @@ class Meta:
 
     active = True
     primary = False
-
+    origin = ''

ietf/person/tests.py

@@ -42,9 +42,9 @@ def test_ajax_search_emails(self):
 
     def test_default_email(self):
         person = PersonFactory()
-        primary = EmailFactory(person=person,primary=True,active=True)
-        EmailFactory(person=person,primary=False,active=True)
-        EmailFactory(person=person,primary=False,active=False)
+        primary = EmailFactory(person=person, primary=True, active=True, origin='test')
+        EmailFactory(person=person, primary=False, active=True, origin='test')
+        EmailFactory(person=person, primary=False, active=False, origin='test')
         self.assertTrue(primary.address in person.formatted_email())
 
     def test_profile(self):

ietf/review/import_from_review_tool.py

@@ -101,7 +101,7 @@ def parse_timestamp(t):
                 for name in new_aliases:
                     Alias.objects.create(person=person, name=name)
 
-            email, created = Email.objects.get_or_create(address=row.email, person=person)
+            email, created = Email.objects.get_or_create(address=row.email, person=person, origin=__name__)
             if created:
                 print "created email", email