Commit ready for merge. This commit implements fixes suggested by Henrik to the MeetingRegistration class

Seth Birkholz · Seth Birkholz · commit 6359192cbb49 · 2017-07-25T20:20:00.000Z
- added tests
    - reverted 'obj' to 'object'
    - removed check for valid email
    - identifing person by Email.person rather than Person.user__username
    - used a simpler form of unidecode logic.  TBD: the previous code was stolen from elsewhere in the code which should also be simplified.
    - Person.name now uses firstname + lastname rather than email.
 - Legacy-Id: 13969
diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py
@@ -1,10 +1,12 @@
+
 import datetime
 
 from mock import patch
 from pyquery import PyQuery
 from requests import Response
 
 from django.urls import reverse as urlreverse
+from django.contrib.auth.models import User
 
 from ietf.utils.test_data import make_test_data, make_review_data
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
@@ -199,3 +201,21 @@ def test_get_meeting_registration_data(self, mock_get):
         get_meeting_registration_data(meeting)
         query = MeetingRegistration.objects.filter(first_name='John',last_name='Smith',country_code='US')
         self.assertTrue(query.count(), 1)
+        self.assertTrue(isinstance(query[0].person,Person))
+        
+    @patch('requests.get')
+    def test_get_meeting_registration_data_user_exists(self, mock_get):
+        response = Response()
+        response.status_code = 200
+        response._content = '[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US","Email":"john.doe@example.us"}]'
+        user = User.objects.create(username="john.doe@example.us")
+        user.save()
+        
+        mock_get.return_value = response
+        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
+        get_meeting_registration_data(meeting)
+        query = MeetingRegistration.objects.filter(first_name='John',last_name='Smith',country_code='US')
+        self.assertTrue(query.count(), 1)
+        self.assertTrue(isinstance(query[0].person, Person))                
+
+        
diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py
@@ -6,7 +6,8 @@
 
 from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias, MeetingRegistration
 from ietf.name.models import CountryName
-from ietf.person.models import Person
+from ietf.person.models import Person, Email
+from ietf.utils import log
 from django.contrib.auth.models import User
 from unidecode import unidecode
 
@@ -236,7 +237,7 @@ def get_meeting_registration_data(meeting):
         # Create a DataTracker MeetingRegistration object
         for registration in decoded:
             person = None
-            obj, created = MeetingRegistration.objects.get_or_create(
+            object, created = MeetingRegistration.objects.get_or_create(
                 meeting_id=meeting.pk,
                 first_name=registration['FirstName'],
                 last_name=registration['LastName'],
@@ -247,24 +248,21 @@ def get_meeting_registration_data(meeting):
 
             # Add a Person object to MeetingRegistration object
             # if valid email is available
-            if not obj.person and "Email" in registration and '@' in registration["Email"]:\
+            if not object.person:
                 # If the person already exists do not try to create a new one
-                persons = Person.objects.filter(user__username=registration["Email"])
-                if len(persons) > 0:
-                    person = persons[0]
+                emails = Email.objects.filter(address=registration["Email"])
+                # there can only be on Email object with a unique email address (primary key)
+                if len(emails) == 1:
+                    person = emails[0].person
                 # Create a new Person object
                 else:
                     # ascii_name - convert from unicode if necessary
                     regname = "%s %s" % (registration["FirstName"], registration["LastName"])
                     # if there are any unicode characters decode the string to ascii
-                    if not all(ord(c) < 128 for c in regname):
-                        ascii_name = unidecode(regname).strip()
-                    # it is already ascii, no need to convert
-                    else:
-                        ascii_name = regname
+                    ascii_name = unidecode(regname).strip()
 
                     # Create a new user object if it does not exist already
-                    # if the user already exists do not try ot create a new one
+                    # if the user already exists do not try to create a new one
                     users = User.objects.filter(username=registration["Email"])
                     if len(users) > 0:
                         user = users[0]
@@ -276,19 +274,20 @@ def get_meeting_registration_data(meeting):
                             username=registration["Email"],
                             email=registration["Email"]
                         )
+                        user.save()
 
                     # Create the new Person object.
                     person = Person.objects.create(
-                        name=registration["Email"],
+                        name=regname,
                         ascii=ascii_name,
                         affiliation=registration["Company"],
                         user=user
                     )
                     person.save()
 
                 # update the person object to an actual value
-                obj.person = person
-                obj.save()
+                object.person = person
+                object.save()
             
             if created:
                 num_created += 1
