From 1d470ae2e4fcb4fa7baaa05a5b839f68a43b422a Mon Sep 17 00:00:00 2001
From: Tao Feng <fengtao04@gmail.com>
Date: Fri, 15 May 2020 16:18:38 -0700
Subject: [PATCH] Fix user unit test (#136)

* Pin common deps to unblock

* fix

* Fix unit test
---
 metadata_service/proxy/neo4j_proxy.py |  2 +-
 tests/unit/proxy/test_neo4j_proxy.py  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/metadata_service/proxy/neo4j_proxy.py b/metadata_service/proxy/neo4j_proxy.py
index 6ae09d10..99ef17fc 100644
--- a/metadata_service/proxy/neo4j_proxy.py
+++ b/metadata_service/proxy/neo4j_proxy.py
@@ -820,7 +820,7 @@ def _build_user_from_record(record: dict, manager_name: str = '') -> UserEntity:
                           slack_id=record.get('slack_id'),
                           employee_type=record.get('employee_type'),
                           role_name=record.get('role_name'),
-                          manager_fullname=manager_name)
+                          manager_fullname=record.get('manager_fullname', manager_name))
 
     @staticmethod
     def _get_user_resource_relationship_clause(relation_type: UserResourceRel, id: str = None,
diff --git a/tests/unit/proxy/test_neo4j_proxy.py b/tests/unit/proxy/test_neo4j_proxy.py
index cb768a7c..51f00b3a 100644
--- a/tests/unit/proxy/test_neo4j_proxy.py
+++ b/tests/unit/proxy/test_neo4j_proxy.py
@@ -549,12 +549,24 @@ def test_get_users(self) -> None:
                 'first_name': 'test_first_name',
                 'team_name': 'test_team',
                 'email': 'test_email',
-                'manager_fullname': ''
+                'manager_fullname': 'test_manager',
             }
             mock_execute.return_value.single.return_value = {'users': [test_user]}
             neo4j_proxy = Neo4jProxy(host='DOES_NOT_MATTER', port=0000)
             users = neo4j_proxy.get_users()
-            self.assertEquals(users, UserSchema(many=True).load([test_user]).data)
+            actual_data = UserSchema(many=True).load([test_user]).data
+            for attr in ['employee_type',
+                         'full_name',
+                         'is_active',
+                         'github_username',
+                         'slack_id',
+                         'last_name',
+                         'first_name',
+                         'team_name',
+                         'email',
+                         'manager_fullname']:
+                self.assertEquals(getattr(users[0], attr),
+                                  getattr(actual_data[0], attr))
 
     def test_get_table_by_user_relation(self) -> None:
         with patch.object(GraphDatabase, 'driver'), patch.object(Neo4jProxy, '_execute_cypher_query') as mock_execute: