fix tests

src/fides/api/models/detection_discovery.py

@@ -364,6 +364,13 @@ def fetch_staged_resources_by_type_query(
     if monitor_config_ids:
         query = query.filter(StagedResource.monitor_config_id.in_(monitor_config_ids))
     if not show_hidden:
-        query = query.filter(StagedResource.diff_status != DiffStatus.MUTED.value)
+        from sqlalchemy import or_
+
+        query = query.filter(
+            or_(
+                StagedResource.diff_status != DiffStatus.MUTED.value,
+                StagedResource.diff_status.is_(None),
+            )
+        )
 
     return query

tests/ops/api/v1/endpoints/test_system.py

@@ -279,9 +279,12 @@ def test_system_patch_hidden(
         system,
         api_client: TestClient,
         generate_auth_header,
+        db: Session,
     ):
         url = V1_URL_PREFIX + f"/system/hidden"
-        auth_header = generate_auth_header(scopes=[SYSTEM_UPDATE])
+        auth_header = generate_auth_header(
+            scopes=[SYSTEM_UPDATE, SYSTEM_MANAGER_UPDATE]
+        )
 
         result = api_client.patch(
             url=f"{url}?hidden=true",
@@ -294,9 +297,9 @@ def test_system_patch_hidden(
             "updated": 1,
         }
 
-        # fetch the system row from db
-        system = System.filter(system.id)
-        assert system.hidden is True
+        query = "SELECT hidden FROM ctl_systems WHERE fides_key = :fides_key"
+        result = db.execute(query, {"fides_key": system.fides_key}).fetchone()
+        assert result[0] is True
 
 
 class TestGetConnections:

tests/ops/models/test_detection_discovery.py

@@ -12,6 +12,7 @@
     MonitorConfig,
     MonitorFrequency,
     StagedResource,
+    fetch_staged_resources_by_type_query,
 )
 
 
@@ -63,6 +64,84 @@ def create_staged_resource(self, db: Session):
         )
         return resource
 
+    @pytest.fixture
+    def create_staged_database(self, db: Session):
+        urn = "bq_monitor_1.prj-bigquery-418515.test_dataset_1"
+        resource = StagedResource.create(
+            db=db,
+            data={
+                "urn": urn,
+                "user_assigned_data_categories": ["user.contact.email"],
+                "name": "test_dataset_1",
+                "resource_type": "Database",
+                "description": "test description",
+                "monitor_config_id": "bq_monitor_1",
+                "source_modified": "2024-03-27T21:47:09.915000+00:00",
+                "classifications": [
+                    {
+                        "label": "user.authorization.credentials",
+                        "score": 0.4247,
+                        "aggregated_score": 0.2336,
+                        "classification_paradigm": "context",
+                    },
+                    {
+                        "label": "system",
+                        "score": 0.4,
+                        "aggregated_score": 0.18,
+                        "classification_paradigm": "content",
+                    },
+                ],
+                "diff_status": DiffStatus.MONITORED.value,
+                "child_diff_statuses": {DiffStatus.CLASSIFICATION_ADDITION.value: 9},
+                "children": [
+                    "bq_monitor_1.prj-bigquery-418515.test_dataset_1.consent-reports-20",
+                    "bq_monitor_1.prj-bigquery-418515.test_dataset_1.consent-reports-21",
+                ],
+                "parent": "bq_monitor_1.prj-bigquery-418515",
+                "meta": {"num_rows": 19},
+            },
+        )
+        return resource
+
+    @pytest.fixture
+    def create_staged_schema(self, db: Session):
+        urn = "bq_monitor_1.prj-bigquery-418515"
+        resource = StagedResource.create(
+            db=db,
+            data={
+                "urn": urn,
+                "user_assigned_data_categories": ["user.contact.email"],
+                "name": "prj-bigquery-418515",
+                "resource_type": "Schema",
+                "description": "test description",
+                "monitor_config_id": "bq_monitor_1",
+                "source_modified": "2024-03-27T21:47:09.915000+00:00",
+                "classifications": [
+                    {
+                        "label": "user.authorization.credentials",
+                        "score": 0.4247,
+                        "aggregated_score": 0.2336,
+                        "classification_paradigm": "context",
+                    },
+                    {
+                        "label": "system",
+                        "score": 0.4,
+                        "aggregated_score": 0.18,
+                        "classification_paradigm": "content",
+                    },
+                ],
+                "diff_status": DiffStatus.MONITORED.value,
+                "child_diff_statuses": {DiffStatus.CLASSIFICATION_ADDITION.value: 9},
+                "children": [
+                    "bq_monitor_1.prj-bigquery-418515.test_dataset_1",
+                    "bq_monitor_1.prj-bigquery-418515.test_dataset_2",
+                ],
+                "parent": "bq_monitor_1",
+                "meta": {"num_rows": 19},
+            },
+        )
+        return resource
+
     def test_get_urn(self, db: Session, create_staged_resource) -> None:
         urn_list = [create_staged_resource.urn]
         from_db = StagedResource.get_urn_list(db, urn_list)
@@ -185,6 +264,38 @@ def test_staged_resource_helpers(self, db: Session, create_staged_resource):
             DiffStatus.CLASSIFICATION_ADDITION.value: 10,
         }
 
+    def test_fetch_staged_resources_by_type_query(
+        self,
+        db: Session,
+        create_staged_resource,
+        create_staged_database,
+        create_staged_schema,
+    ) -> None:
+        """
+        Tests that the fetch_staged_resources_by_type_query works as expected
+        """
+        query = fetch_staged_resources_by_type_query("Table")
+        resources = db.execute(query).all()
+        assert len(resources) == 1
+        assert resources[0][0].resource_type == "Table"
+        assert resources[0][0].urn == create_staged_resource.urn
+
+        query = fetch_staged_resources_by_type_query("Schema")
+        resources = db.execute(query).all()
+        assert len(resources) == 1
+
+        query = fetch_staged_resources_by_type_query("Database")
+        resources = db.execute(query).all()
+        assert len(resources) == 1
+        assert resources[0][0].urn == create_staged_database.urn
+
+        database = StagedResource.get_urn(db, create_staged_database.urn)
+        database.diff_status = None
+        database.save(db)
+        query = fetch_staged_resources_by_type_query("Database")
+        resources = db.execute(query).all()
+        assert len(resources) == 1
+
 
 SAMPLE_START_DATE = datetime(2024, 5, 20, 0, 42, 5, 17137, tzinfo=timezone.utc)