diff --git a/analytics/Makefile b/analytics/Makefile index a9b1bd07d..1e7fbc646 100644 --- a/analytics/Makefile +++ b/analytics/Makefile @@ -154,7 +154,7 @@ gh-transform-and-load: @echo "=> Transforming and loading GitHub data into the database" @echo "=====================================================" $(POETRY) analytics etl transform_and_load \ - --deliverable-file $(DELIVERY_FILE) \ + --issue-file $(ISSUE_FILE) \ --effective-date $(EFFECTIVE_DATE) @echo "=====================================================" diff --git a/analytics/src/analytics/cli.py b/analytics/src/analytics/cli.py index 1d9bde629..84c3c379b 100644 --- a/analytics/src/analytics/cli.py +++ b/analytics/src/analytics/cli.py @@ -40,7 +40,6 @@ STATUS_ARG = typer.Option( help="Deliverable status to include in report, can be passed multiple times", ) -DELIVERABLE_FILE_ARG = typer.Option(help="Path to file with exported deliverable data") EFFECTIVE_DATE_ARG = typer.Option(help="YYYY-MM-DD effective date to apply to each imported row") # fmt: on @@ -264,7 +263,7 @@ def initialize_database() -> None: @etl_app.command(name="transform_and_load") def transform_and_load( - deliverable_file: Annotated[str, DELIVERABLE_FILE_ARG], + issue_file: Annotated[str, ISSUE_FILE_ARG], effective_date: Annotated[str, EFFECTIVE_DATE_ARG], ) -> None: """Transform and load etl data.""" @@ -282,7 +281,7 @@ def transform_and_load( return # hydrate a dataset instance from the input data - dataset = EtlDataset.load_from_json_file(file_path=deliverable_file) + dataset = EtlDataset.load_from_json_file(file_path=issue_file) # sync data to db etldb.sync_db(dataset, datestamp) diff --git a/analytics/tests/test_cli.py b/analytics/tests/test_cli.py index da7dbffc8..dec9ed29d 100644 --- a/analytics/tests/test_cli.py +++ b/analytics/tests/test_cli.py @@ -301,7 +301,7 @@ def test_transform_and_load_with_valid_parameters(self): command = [ "etl", "transform_and_load", - "--deliverable-file", + "--issue-file", self.TEST_FILE_1, "--effective-date", str(self.EFFECTIVE_DATE), @@ -328,7 +328,7 @@ def test_transform_and_load_with_malformed_effective_date_parameter(self): command = [ "etl", "transform_and_load", - "--deliverable-file", + "--issue-file", self.TEST_FILE_1, "--effective-date", "2024-Oct-07",