fix(toggl): correct harvest output column names

Author: thekaveman

compiler_admin/services/harvest.py

@@ -8,7 +8,7 @@
 import compiler_admin.services.files as files
 
 # input CSV columns needed for conversion
-INPUT_COLUMNS = ["Date", "Client", "Project", "Notes", "Hours", "First Name", "Last Name"]
+INPUT_COLUMNS = ["Date", "Client", "Project", "Notes", "Hours", "First name", "Last name"]
 
 # default output CSV columns
 OUTPUT_COLUMNS = ["Email", "Start date", "Start time", "Duration", "Project", "Task", "Client", "Billable", "Description"]
@@ -63,7 +63,7 @@ def convert_to_toggl(
     source["Billable"] = "Yes"
 
     # add the Email column
-    source["Email"] = source["First Name"].apply(lambda x: f"{x.lower()}@compiler.la")
+    source["Email"] = source["First name"].apply(lambda x: f"{x.lower()}@compiler.la")
 
     # Convert numeric Hours to timedelta Duration
     source["Duration"] = source["Hours"].apply(pd.to_timedelta, unit="hours")

compiler_admin/services/toggl.py

@@ -18,7 +18,7 @@
 INPUT_COLUMNS = ["Email", "Task", "Client", "Start date", "Start time", "Duration", "Description"]
 
 # default output CSV columns
-OUTPUT_COLUMNS = ["Date", "Client", "Project", "Task", "Notes", "Hours", "First Name", "Last Name"]
+OUTPUT_COLUMNS = ["Date", "Client", "Project", "Task", "Notes", "Hours", "First name", "Last name"]
 
 
 def _harvest_client_name():
@@ -119,9 +119,9 @@ def convert_to_harvest(
     # get cached project name if any
     source["Project"] = source["Project"].apply(lambda x: _toggl_project_info(x) or x)
 
-    # assign First and Last Name
-    source["First Name"] = source["Email"].apply(_get_first_name)
-    source["Last Name"] = source["Email"].apply(_get_last_name)
+    # assign First and Last name
+    source["First name"] = source["Email"].apply(_get_first_name)
+    source["Last name"] = source["Email"].apply(_get_last_name)
 
     # calculate hours as a decimal from duration timedelta
     source["Hours"] = (source["Duration"].dt.total_seconds() / 3600).round(2)

notebooks/data/harvest-sample.csv

@@ -1,4 +1,4 @@
-Date,Client,Project,Project Code,Task,Notes,Hours,Billable?,Invoiced?,Approved?,First Name,Last Name,Roles,Employee?,External Reference URL
+Date,Client,Project,Project Code,Task,Notes,Hours,Billable?,Invoiced?,Approved?,First name,Last name,Roles,Employee?,External Reference URL
 2023-01-21,Client1,Project5,PROJECT,Project Consulting,nascetur ridiculus mus etiam vel augue vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id massa id nisl venenatis lacinia aenean sit,2.51,true,false,false,Hetti,Becken,Team Member,true,
 2023-01-07,Client1,Project4,PROJECT,Project Consulting,quam a odio in hac habitasse platea dictumst maecenas ut massa quis augue luctus tincidunt nulla mollis molestie lorem quisque ut erat curabitur,1.84,false,true,false,Sawyer,Berrey,Team Member,false,
 2023-01-25,Client1,Project5,PROJECT,Project Consulting,odio odio elementum eu interdum eu tincidunt in leo maecenas pulvinar lobortis est,2.11,true,false,true,Silas,Idenden,Team Member,true,

tests/services/test_toggl.py

@@ -206,7 +206,7 @@ def test_convert_to_harvest_sample(toggl_file, harvest_file, mock_google_user_in
     assert isinstance(output, str)
     assert ",".join(OUTPUT_COLUMNS) in output
 
-    order = ["Date", "First Name", "Hours"]
+    order = ["Date", "First name", "Hours"]
     sample_output_df = pd.read_csv(harvest_file).sort_values(order)
     output_df = pd.read_csv(StringIO(output)).sort_values(order)