refactor(download): move default client_id to envvar

Author: thekaveman

compiler_admin/commands/time/download.py

@@ -56,9 +56,10 @@ def prior_month_start():
     "-c",
     "--client",
     "client_ids",
-    multiple=True,
+    envvar="TOGGL_CLIENT_ID",
     help="An ID for a Toggl Client to filter for in reports. Can be supplied more than once.",
     metavar="CLIENT_ID",
+    multiple=True,
     type=int,
 )
 @click.option(

compiler_admin/services/toggl.py

@@ -192,12 +192,6 @@ def download_time_entries(
     Returns:
         None. Either prints the resulting CSV data or writes to output_path.
     """
-    env_client_id = os.environ.get("TOGGL_CLIENT_ID")
-    if env_client_id:
-        env_client_id = int(env_client_id)
-    if ("client_ids" not in kwargs or not kwargs["client_ids"]) and isinstance(env_client_id, int):
-        kwargs["client_ids"] = [env_client_id]
-
     token = os.environ.get("TOGGL_API_TOKEN")
     workspace = os.environ.get("TOGGL_WORKSPACE_ID")
     toggl = Toggl(token, workspace)

tests/commands/time/test_download.py

@@ -89,7 +89,29 @@ def test_download(cli_runner, mock_download_time_entries):
     )
 
 
-def test_download_all(cli_runner, mock_download_time_entries):
+def test_download_client_envvar(cli_runner, monkeypatch, mock_download_time_entries):
+    monkeypatch.setenv("TOGGL_CLIENT_ID", 1234)
+
+    date = datetime.now(tz=TZINFO).replace(hour=0, minute=0, second=0, microsecond=0)
+    args = [
+        "--start",
+        date.strftime("%Y-%m-%d %H:%M:%S%z"),
+        "--end",
+        date.strftime("%Y-%m-%d %H:%M:%S%z"),
+        "--output",
+        "output",
+    ]
+
+    result = cli_runner.invoke(download, args)
+
+    assert result.exit_code == RESULT_SUCCESS
+    mock_download_time_entries.assert_called_once_with(
+        start_date=date, end_date=date, output_path="output", output_cols=TOGGL_COLUMNS, billable=True, client_ids=(1234,)
+    )
+
+
+def test_download_all(cli_runner, monkeypatch, mock_download_time_entries):
+    monkeypatch.delenv("TOGGL_CLIENT_ID", raising=False)
     date = datetime.now(tz=TZINFO).replace(hour=0, minute=0, second=0, microsecond=0)
     args = [
         "--start",