From 9c858cfb6abbe6bd1f272a7526a0a139d9efee5b Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <shakhat@gmail.com>
Date: Fri, 20 Sep 2013 16:34:50 +0400
Subject: [PATCH] Verify that empty email is not added into user profile

Closes bug #1228107

Change-Id: I5ad0cf0ba0bacc50419c01f46623d30b38574305
---
 stackalytics/processor/record_processor.py |  3 +-
 tests/unit/test_record_processor.py        | 43 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/stackalytics/processor/record_processor.py b/stackalytics/processor/record_processor.py
index 430987155..284084479 100644
--- a/stackalytics/processor/record_processor.py
+++ b/stackalytics/processor/record_processor.py
@@ -154,7 +154,8 @@ class RecordProcessor(object):
             if (launchpad_id) and (launchpad_id in self.users_index):
                 # merge emails
                 user = self.users_index[launchpad_id]
-                self._update_user_profile(user, email)
+                if email:
+                    self._update_user_profile(user, email)
             else:
                 # create new
                 if not user_name:
diff --git a/tests/unit/test_record_processor.py b/tests/unit/test_record_processor.py
index 02d710c6f..254c40380 100644
--- a/tests/unit/test_record_processor.py
+++ b/tests/unit/test_record_processor.py
@@ -468,6 +468,49 @@ class TestRecordProcessor(testtools.TestCase):
         self.assertEquals({'john_doe': user, 'john_doe@gmail.com': user},
                           record_processor_inst.users_index)
 
+    def test_process_review_then_blueprint(self):
+        record_processor_inst = self.make_record_processor(
+            lp_user_name={
+                'john_doe': {'name': 'john_doe', 'display_name': 'John Doe'}})
+
+        processed_records = list(record_processor_inst.process([
+            {'record_type': 'review',
+             'id': 'I1045730e47e9e6ad31fcdfbaefdad77e2f3b2c3e',
+             'subject': 'Fix AttributeError in Keypair._add_details()',
+             'owner': {'name': 'John Doe',
+                       'email': 'john_doe@gmail.com',
+                       'username': 'john_doe'},
+             'createdOn': 1379404951,
+             'module': 'nova'},
+            {'record_type': 'bp',
+             'self_link': 'http://launchpad.net/blueprint',
+             'owner': 'john_doe',
+             'date_created': 1234567890}
+        ]))
+
+        self.assertRecordsMatch(
+            {'record_type': 'review',
+             'launchpad_id': 'john_doe',
+             'author_name': 'John Doe',
+             'author_email': 'john_doe@gmail.com',
+             'company_name': '*independent'},
+            processed_records[0])
+
+        self.assertRecordsMatch(
+            {'record_type': 'bpd',
+             'launchpad_id': 'john_doe',
+             'author_name': 'John Doe',
+             'company_name': '*independent'},
+            processed_records[1])
+
+        user = {'user_id': 'john_doe',
+                'launchpad_id': 'john_doe',
+                'user_name': 'John Doe',
+                'emails': ['john_doe@gmail.com'],
+                'companies': [{'company_name': '*independent', 'end_date': 0}]}
+        self.assertEquals({'john_doe': user, 'john_doe@gmail.com': user},
+                          record_processor_inst.users_index)
+
     # update records
 
     def _generate_record_commit(self):