From d1a47eb93c537e3d22af2e51dc4c8dc50084764e Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Fri, 30 Apr 2021 11:59:31 +0000 Subject: [PATCH 1/4] use f str for format --- src/code42cli/cmds/cases.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code42cli/cmds/cases.py b/src/code42cli/cmds/cases.py index dc862967..583758ef 100644 --- a/src/code42cli/cmds/cases.py +++ b/src/code42cli/cmds/cases.py @@ -288,7 +288,7 @@ def bulk(state): @bulk.command( name="add", help="Bulk associate file events to cases using a CSV file with " - "format: {}.".format(",".join(FILE_EVENTS_HEADERS)), + f"format: {','.join(FILE_EVENTS_HEADERS)}." ) @read_csv_arg(headers=FILE_EVENTS_HEADERS) @sdk_options() @@ -306,7 +306,7 @@ def handle_row(case_number, event_id): @bulk.command( name="remove", help="Bulk remove the file event association from cases using a CSV file with " - "format: {}.".format(",".join(FILE_EVENTS_HEADERS)), + f"format: {','.join(FILE_EVENTS_HEADERS)}." ) @read_csv_arg(headers=FILE_EVENTS_HEADERS) @sdk_options() From 69fb0ee0ef93555258ed99b22f43cab02c44e958 Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Fri, 30 Apr 2021 11:59:53 +0000 Subject: [PATCH 2/4] correct args --- src/code42cli/cmds/cases.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/code42cli/cmds/cases.py b/src/code42cli/cmds/cases.py index 583758ef..f5988bce 100644 --- a/src/code42cli/cmds/cases.py +++ b/src/code42cli/cmds/cases.py @@ -295,8 +295,8 @@ def bulk(state): def bulk_add(state, csv_rows): sdk = state.sdk - def handle_row(case_number, event_id): - sdk.cases.file_events.add(case_number, event_id) + def handle_row(number, event_id): + sdk.cases.file_events.add(number, event_id) run_bulk_process( handle_row, csv_rows, progress_label="Associating file events to cases:", @@ -313,8 +313,8 @@ def handle_row(case_number, event_id): def bulk_remove(state, csv_rows): sdk = state.sdk - def handle_row(case_number, event_id): - sdk.cases.file_events.delete(case_number, event_id) + def handle_row(number, event_id): + sdk.cases.file_events.delete(number, event_id) run_bulk_process( handle_row, From 222c507a021086875315f6801ef4235bf086aca9 Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Fri, 30 Apr 2021 12:09:06 +0000 Subject: [PATCH 3/4] change case --- src/code42cli/cmds/cases.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code42cli/cmds/cases.py b/src/code42cli/cmds/cases.py index f5988bce..c0eac0be 100644 --- a/src/code42cli/cmds/cases.py +++ b/src/code42cli/cmds/cases.py @@ -275,7 +275,7 @@ def bulk(state): FILE_EVENTS_HEADERS = [ "number", - "eventId", + "event_id", ] case_file_events_generate_template = generate_template_cmd_factory( From 04243cb8d0ab141f1d79173021c93ef6f63b7bdd Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Fri, 30 Apr 2021 12:12:41 +0000 Subject: [PATCH 4/4] style and tests --- src/code42cli/cmds/cases.py | 4 ++-- tests/cmds/test_cases.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/code42cli/cmds/cases.py b/src/code42cli/cmds/cases.py index c0eac0be..be415d5a 100644 --- a/src/code42cli/cmds/cases.py +++ b/src/code42cli/cmds/cases.py @@ -288,7 +288,7 @@ def bulk(state): @bulk.command( name="add", help="Bulk associate file events to cases using a CSV file with " - f"format: {','.join(FILE_EVENTS_HEADERS)}." + f"format: {','.join(FILE_EVENTS_HEADERS)}.", ) @read_csv_arg(headers=FILE_EVENTS_HEADERS) @sdk_options() @@ -306,7 +306,7 @@ def handle_row(number, event_id): @bulk.command( name="remove", help="Bulk remove the file event association from cases using a CSV file with " - f"format: {','.join(FILE_EVENTS_HEADERS)}." + f"format: {','.join(FILE_EVENTS_HEADERS)}.", ) @read_csv_arg(headers=FILE_EVENTS_HEADERS) @sdk_options() diff --git a/tests/cmds/test_cases.py b/tests/cmds/test_cases.py index 25392b3f..ee646ac8 100644 --- a/tests/cmds/test_cases.py +++ b/tests/cmds/test_cases.py @@ -472,15 +472,15 @@ def test_add_bulk_file_events_to_cases_uses_expected_arguments( bulk_processor = mocker.patch("code42cli.cmds.cases.run_bulk_process") with runner.isolated_filesystem(): with open("test_add.csv", "w") as csv: - csv.writelines(["number,eventId\n", "1,abc\n", "2,pqr\n"]) + csv.writelines(["number,event_id\n", "1,abc\n", "2,pqr\n"]) runner.invoke( cli, ["cases", "file-events", "bulk", "add", "test_add.csv"], obj=cli_state_with_user, ) assert bulk_processor.call_args[0][1] == [ - {"number": "1", "eventId": "abc"}, - {"number": "2", "eventId": "pqr"}, + {"number": "1", "event_id": "abc"}, + {"number": "2", "event_id": "pqr"}, ] @@ -490,13 +490,13 @@ def test_remove_bulk_file_events_from_cases_uses_expected_arguments( bulk_processor = mocker.patch("code42cli.cmds.cases.run_bulk_process") with runner.isolated_filesystem(): with open("test_remove.csv", "w") as csv: - csv.writelines(["number,eventId\n", "1,abc\n", "2,pqr\n"]) + csv.writelines(["number,event_id\n", "1,abc\n", "2,pqr\n"]) runner.invoke( cli, ["cases", "file-events", "bulk", "remove", "test_remove.csv"], obj=cli_state_with_user, ) assert bulk_processor.call_args[0][1] == [ - {"number": "1", "eventId": "abc"}, - {"number": "2", "eventId": "pqr"}, + {"number": "1", "event_id": "abc"}, + {"number": "2", "event_id": "pqr"}, ]