fix(toggl): look up first name from Google

we are moving away from the pattern of first@compiler.la, so we can't rely
on splitting the email address and using the prefix as the First Name

instead, look up from Google, the same as for Last Name

Author: thekaveman

compiler_admin/services/toggl.py

@@ -33,35 +33,29 @@ def user_info():
     return files.JsonFileCache("TOGGL_USER_INFO")
 
 
-def _get_first_name(email: str) -> str:
-    """Get cached first name or derive from email."""
+def _get_name(email: str, name_key) -> str:
+    """Get cached name or query from Google."""
     info = user_info()
     user = info.get(email)
-    first_name = user.get("First Name") if user else None
-    if first_name is None:
-        parts = email.split("@")
-        first_name = parts[0].capitalize()
-        data = {"First Name": first_name}
+    name = user.get(name_key) if user else None
+    if name is None:
+        user = google_user_info(email)
+        name = user.get(name_key) if user else None
         if email in info:
-            info[email].update(data)
+            info[email].update(user)
         else:
-            info[email] = data
-    return first_name
+            info[email] = user
+    return name
+
+
+def _get_first_name(email: str) -> str:
+    """Get cached last name or query from Google."""
+    return _get_name(email, "First Name")
 
 
 def _get_last_name(email: str):
     """Get cached last name or query from Google."""
-    info = user_info()
-    user = info.get(email)
-    last_name = user.get("Last Name") if user else None
-    if last_name is None:
-        user = google_user_info(email)
-        last_name = user.get("Last Name") if user else None
-        if email in info:
-            info[email].update(user)
-        else:
-            info[email] = user
-    return last_name
+    return _get_name(email, "Last Name")
 
 
 def _prepare_input(source_path: str | TextIO, column_renames: dict = {}) -> pd.DataFrame:

tests/services/test_toggl.py

@@ -78,26 +78,30 @@ def test_get_first_name_matching(mock_user_info):
     assert result == "User"
 
 
-def test_get_first_name_calcuated_with_record(mock_user_info):
+def test_get_first_name_lookup_with_record(mock_user_info, mock_google_user_info):
     email = "user@email.com"
     mock_user_info.return_value = {email: {"Data": 1234}}
+    mock_google_user_info.return_value = {"First Name": "User"}
 
     result = _get_first_name(email)
 
     assert result == "User"
     assert mock_user_info.return_value[email]["First Name"] == "User"
     assert mock_user_info.return_value[email]["Data"] == 1234
+    mock_google_user_info.assert_called_once_with(email)
 
 
-def test_get_first_name_calcuated_without_record(mock_user_info):
+def test_get_first_name_lookup_without_record(mock_user_info, mock_google_user_info):
     email = "user@email.com"
     mock_user_info.return_value = {email: {}}
+    mock_google_user_info.return_value = {"First Name": "User"}
 
     result = _get_first_name(email)
 
     assert result == "User"
     assert mock_user_info.return_value[email]["First Name"] == "User"
     assert list(mock_user_info.return_value[email].keys()) == ["First Name"]
+    mock_google_user_info.assert_called_once_with(email)
 
 
 def test_get_last_name_matching(mock_user_info, mock_google_user_info):