clean up further test failures and visualize sort

ethyca · Jul 12, 2022 · c4a8d86 · c4a8d86
1 parent b6b0e52
commit c4a8d86
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 33 deletions.
diff --git a/docs/fides/docs/language/taxonomy/data_categories.md b/docs/fides/docs/language/taxonomy/data_categories.md
@@ -39,7 +39,7 @@ The fides key of the organization to which this Data Category belongs.
 
 ## Top Level Data Categories
 
-There are three top-level categories:
+There are two top-level categories:
 
 | Label     | Parent Key    | Description                                           |
 | ---       | ---           | ---                                                   |

diff --git a/src/fidesctl/core/visualize.py b/src/fidesctl/core/visualize.py
@@ -34,7 +34,8 @@ def hierarchy_figures(
     fides_key_dict = {}
 
     # build assets/relationships for figures
-    for i, category in enumerate(categories):
+    sorted_categories = sorted(categories, key=lambda i: i[FIDES_KEY_NAME])
+    for i, category in enumerate(sorted_categories):
         # get sunburst labels and parents
         labels.append(category[FIDES_KEY_NAME])
         parents.append(category[FIDES_PARENT_NAME])

diff --git a/tests/core/test_evaluate.py b/tests/core/test_evaluate.py
@@ -110,7 +110,7 @@ def test_populate_referenced_keys_recursively(test_config: FidesctlConfig) -> No
                     privacy_declarations=[
                         PrivacyDeclaration(
                             name="privacy_declaration_1",
-                            data_categories=["account.contact.email"],
+                            data_categories=["user.contact.email"],
                             data_use="provide.service",
                             data_qualifier="aggregated.anonymized",
                             data_subjects=["customer"],
@@ -128,7 +128,7 @@ def test_populate_referenced_keys_recursively(test_config: FidesctlConfig) -> No
         category.fides_key for category in result_taxonomy.data_category
     ]
     assert sorted(populated_categories) == sorted(
-        ["account.contact.email", "account.contact", "account"]
+        ["user.contact.email", "user.contact", "user"]
     )
 
     populated_data_uses = [data_use.fides_key for data_use in result_taxonomy.data_use]

diff --git a/tests/core/test_export.py b/tests/core/test_export.py
@@ -30,8 +30,8 @@ def test_sample_system_taxonomy() -> Generator:
                     PrivacyDeclaration(
                         name="privacy_declaration_1",
                         data_categories=[
-                            "account.contact.email",
-                            "account.contact.name",
+                            "user.contact.email",
+                            "user.contact.name",
                         ],
                         data_use="provide.service",
                         data_qualifier="aggregated.anonymized",

diff --git a/tests/core/test_visualize.py b/tests/core/test_visualize.py
@@ -14,25 +14,25 @@
 def sample_categories_list() -> List:
     return [
         {
-            "fides_key": "account",
+            "fides_key": "user",
             "organization_fides_key": "default_organization",
-            "name": "Account Data",
-            "description": "Data related to a system account.",
+            "name": "User Data",
+            "description": "Data related to a user.",
             "parent_key": None,
         },
         {
-            "fides_key": "account.contact",
+            "fides_key": "user.contact",
             "organization_fides_key": "default_organization",
-            "name": "Account Contact Data",
-            "description": "Contact data related to a system account.",
-            "parent_key": "account",
+            "name": "User Contact Data",
+            "description": "Contact data related to a user.",
+            "parent_key": "user",
         },
         {
-            "fides_key": "account.contact.city",
+            "fides_key": "user.contact.address",
             "organization_fides_key": "default_organization",
-            "name": "Account City",
-            "description": "Account's city level address data.",
-            "parent_key": "account.contact",
+            "name": "User Address",
+            "description": "User address data.",
+            "parent_key": "user.contact",
         },
     ]
 
@@ -49,7 +49,7 @@ def test_hierarchy_figures(sample_categories_list: List) -> None:
 
 @pytest.mark.unit
 def test_convert_categories_to_nested_dict(sample_categories_list: List) -> None:
-    expected_conversion: Dict = {"account": {"contact": {"city": {}}}}
+    expected_conversion: Dict = {"user": {"contact": {"address": {}}}}
     assert (
         visualize.convert_categories_to_nested_dict(sample_categories_list)
         == expected_conversion
@@ -58,7 +58,7 @@ def test_convert_categories_to_nested_dict(sample_categories_list: List) -> None
 
 @pytest.mark.unit
 def test_nested_categories_to_html_list(sample_categories_list: List) -> None:
-    expected_html_list = "<h2>Fides Data Category Hierarchy</h2>\n   <li>account</li>\n   <ul>\n      <li>contact</li>\n      <ul>\n         <li>city</li>\n         <ul>\n\n         </ul>\n      </ul>\n   </ul>"
+    expected_html_list = "<h2>Fides Data Category Hierarchy</h2>\n   <li>user</li>\n   <ul>\n      <li>contact</li>\n      <ul>\n         <li>address</li>\n         <ul>\n\n         </ul>\n      </ul>\n   </ul>"
     assert (
         visualize.nested_categories_to_html_list(
             sample_categories_list, resource_type="data_category"

diff --git a/tests/data/sample_hierarchy_figures.json b/tests/data/sample_hierarchy_figures.json
@@ -3,14 +3,14 @@
     {
       "hoverinfo": "skip",
       "labels": [
-        "account",
-        "account.contact",
-        "account.contact.city"
+        "user",
+        "user.contact",
+        "user.contact.address"
       ],
       "parents": [
         null,
-        "account",
-        "account.contact"
+        "user",
+        "user.contact"
       ],
       "type": "sunburst"
     },
@@ -33,9 +33,9 @@
       "node": {
         "color": "blue",
         "label": [
-          "account",
-          "account.contact",
-          "account.contact.city"
+          "user",
+          "user.contact",
+          "user.contact.address"
         ],
         "line": {
           "color": "black",
@@ -52,14 +52,14 @@
     {
       "hoverinfo": "skip",
       "labels": [
-        "account",
-        "account.contact",
-        "account.contact.city"
+        "user",
+        "user.contact",
+        "user.contact.address"
       ],
       "parents": [
         null,
-        "account",
-        "account.contact"
+        "user",
+        "user.contact"
       ],
       "type": "icicle",
       "visible": false
@@ -934,4 +934,4 @@
       }
     ]
   }
-}
+}