Drop NULL technical_source from filter choices (#318)

etalab · Jun 30, 2022 · 199afcb · 199afcb
1 parent 4c54f34
commit 199afcb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/server/infrastructure/datasets/repositories.py b/server/infrastructure/datasets/repositories.py
@@ -75,7 +75,9 @@ async def get_service_set(self) -> Set[str]:
 
     async def get_technical_source_set(self) -> Set[str]:
         async with self._db.session() as session:
-            stmt = select(DatasetModel.technical_source.distinct())
+            stmt = select(DatasetModel.technical_source.distinct()).where(
+                DatasetModel.technical_source.is_not(None)
+            )
             result = await session.execute(stmt)
             return set(result.scalars())
 

diff --git a/tests/api/test_datasets_filters.py b/tests/api/test_datasets_filters.py
@@ -23,11 +23,19 @@ async def test_dataset_filters_info(
 
     await bus.execute(
         CreateDatasetFactory.build(
-            service="Example service",
+            service="Same example service",
             technical_source="Example database system",
         )
     )
 
+    # Add another with filterable optional fields left out
+    await bus.execute(
+        CreateDatasetFactory.build(
+            service="Same example service",
+            technical_source=None,
+        )
+    )
+
     response = await client.get("/datasets/filters/", auth=temp_user.auth)
     assert response.status_code == 200
 
@@ -53,7 +61,7 @@ async def test_dataset_filters_info(
     ]
 
     assert data["service"] == [
-        "Example service",
+        "Same example service",
     ]
 
     assert sorted(data["format"]) == [