Exclude recently connected devices prior to filtering by date. (#333)

* drop most-recently-connected devices prior to filtering by date-connected or date-created.

* changelog

Author: ceciliastevens

CHANGELOG.md

@@ -13,6 +13,7 @@ how a consumer would use the library (e.g. adding unit tests, updating documenta
 ### Fixed
 
 - Incorrect column title on `code42 trusted-activities bulk create` command help text.
+- `code42 devices list` will now process `--exclude-most-recently-connected` prior to `--last-connected-before` instead of after.
 
 ### Added
 

src/code42cli/cmds/devices.py

@@ -334,6 +334,13 @@ def list_devices(
         org_uid,
         (include_backup_usage or include_total_storage),
     )
+    if exclude_most_recently_connected:
+        most_recent = (
+            df.sort_values(["userUid", "lastConnected"], ascending=False)
+            .groupby("userUid")
+            .head(exclude_most_recently_connected)
+        )
+        df = df.drop(most_recent.index)
     if last_connected_after:
         df = df.loc[to_datetime(df.lastConnected) > last_connected_after]
     if last_connected_before:
@@ -342,13 +349,6 @@ def list_devices(
         df = df.loc[to_datetime(df.creationDate) > created_after]
     if created_before:
         df = df.loc[to_datetime(df.creationDate) < created_before]
-    if exclude_most_recently_connected:
-        most_recent = (
-            df.sort_values(["userUid", "lastConnected"], ascending=False)
-            .groupby("userUid")
-            .head(exclude_most_recently_connected)
-        )
-        df = df.drop(most_recent.index)
     if include_total_storage:
         df = _add_storage_totals_to_dataframe(df, include_backup_usage)
     if include_settings:

tests/cmds/test_devices.py

@@ -742,6 +742,24 @@ def test_list_invalid_org_uid_raises_error(runner, cli_state, custom_error):
     )
 
 
+def test_list_excludes_recently_connected_devices_before_filtering_by_date(
+    runner, cli_state, get_all_devices_success,
+):
+    result = runner.invoke(
+        cli,
+        [
+            "devices",
+            "list",
+            "--exclude-most-recently-connected",
+            "1",
+            "--last-connected-before",
+            TEST_DATE_NEWER,
+        ],
+        obj=cli_state,
+    )
+    assert "839648314463407622" in result.output
+
+
 def test_list_backup_sets_invalid_org_uid_raises_error(runner, cli_state, custom_error):
     custom_error.response.text = "Unable to find org"
     invalid_org_uid = "invalid_org_uid"