x/stackalytics
Code Issues Proposed changes

Merge "Do not override company from user profile for closed period"

Browse Source
This commit is contained in:
Jenkins
2014-09-29 09:15:19 +00:00
committed by Gerrit Code Review
parent 3a45b63073 d705bb52a9
commit 395abee824
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stackalytics/processor/record_processor.py
View File

@@ -78,8 +78,8 @@ class RecordProcessor(object):
def _find_company(self, companies, date): def _find_company(self, companies, date):
for r in companies: for r in companies:
if date < r['end_date']: if date < r['end_date']:
return r['company_name'] return r['company_name'], 'strict'
return companies[-1]['company_name'] return companies[-1]['company_name'], 'open' # may be overridden
def _get_company_by_email(self, email): def _get_company_by_email(self, email):
if not email: if not email:
@@ -247,8 +247,8 @@ class RecordProcessor(object):
if user.get('user_name'): if user.get('user_name'):
record['author_name'] = user['user_name'] record['author_name'] = user['user_name']
company = self._find_company(user['companies'], record['date']) company, policy = self._find_company(user['companies'], record['date'])
if company != '*robots': if company != '*robots' and policy == 'open':
company = (self._get_company_by_email(record.get('author_email')) company = (self._get_company_by_email(record.get('author_email'))
or company) or company)
record['company_name'] = company record['company_name'] = company

33
tests/unit/test_record_processor.py
View File

@@ -208,6 +208,39 @@ class TestRecordProcessor(testtools.TestCase):
self.assertIn('johndoe@ibm.com', utils.load_user( self.assertIn('johndoe@ibm.com', utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe')['emails']) record_processor_inst.runtime_storage_inst, 'john_doe')['emails'])
def test_process_commit_existing_user_old_job_not_overridden(self):
# User is known to LP, his email is new to us, and maps to other
# company. Have some record with new email, but from the period when
# he worked for other company. Should return other company as mentioned
# in profile instead of overriding
record_processor_inst = self.make_record_processor(
users=[
{'user_id': 'john_doe',
'launchpad_id': 'john_doe',
'user_name': 'John Doe',
'emails': ['johndoe@nec.co.jp'],
'companies': [{'company_name': 'IBM', 'end_date': 1200000000},
{'company_name': 'NEC', 'end_date': 0}]}
],
companies=[{'company_name': 'IBM', 'domains': ['ibm.com']},
{'company_name': 'NEC', 'domains': ['nec.com']}],
lp_info={'johndoe@nec.com':
{'name': 'john_doe', 'display_name': 'John Doe'}})
processed_commit = list(record_processor_inst.process(
generate_commits(author_email='johndoe@nec.com',
author_name='John Doe',
date=1000000000)))[0]
expected_commit = {
'launchpad_id': 'john_doe',
'author_email': 'johndoe@nec.com',
'author_name': 'John Doe',
'company_name': 'IBM',
}
self.assertRecordsMatch(expected_commit, processed_commit)
def test_process_commit_existing_user_new_email_unknown_company(self): def test_process_commit_existing_user_new_email_unknown_company(self):
# User is known to LP, but his email is new to us. Should match # User is known to LP, but his email is new to us. Should match
# the user and return company from user profile # the user and return company from user profile