split query params on "," rather than aggregate list and adjust tests (#59)

Author: pstokkink

src/schema_api/views.py

@@ -49,16 +49,16 @@ def retrieve(self, request, name):
         dataset_schema = dataset.schema
 
         # Table filtering
-        tables_param = request.query_params.getlist("tables")
+        tables_param = request.query_params.get("tables")
         if tables_param:
-            dataset_schema = DatasetSchema.filter_on_tables(dataset_schema, tables_param)
+            tables = tables_param.split(",")
+            dataset_schema = DatasetSchema.filter_on_tables(dataset_schema, tables)
 
         # Scope filtering
-        scopes_param = request.query_params.getlist("scopes")
+        scopes_param = request.query_params.get("scopes")
         if scopes_param:
-
             # Transform url safe scope ids to regular ids
-            scopes = [scope.replace("_", "/").upper() for scope in scopes_param]
+            scopes = [scope.replace("_", "/").upper() for scope in scopes_param.split(",")]
             dataset_schema = DatasetSchema.filter_on_scopes(dataset_schema, scopes)
 
         return Response(dataset_schema)
@@ -71,16 +71,17 @@ def version(self, request, name, vmajor):
         dataset_schema = dataset.schema
 
         # Table filtering
-        tables_param = request.query_params.getlist("tables")
+        tables_param = request.query_params.get("tables")
         if tables_param:
-            dataset_schema = DatasetSchema.filter_on_tables(dataset_schema, tables_param)
+            tables = tables_param.split(",")
+            dataset_schema = DatasetSchema.filter_on_tables(dataset_schema, tables)
 
         # Scope filtering
-        scopes_param = request.query_params.getlist("scopes")
+        scopes_param = request.query_params.get("scopes")
         if scopes_param:
 
             # Transform url safe scope ids to regular ids
-            scopes = [scope.replace("_", "/").upper() for scope in scopes_param]
+            scopes = [scope.replace("_", "/").upper() for scope in scopes_param.split(",")]
             dataset_schema = DatasetSchema.filter_on_scopes(dataset_schema, scopes)
 
         try:
@@ -98,11 +99,11 @@ def table(self, request, name, vmajor, table_id):
         dataset_schema = dataset.schema
 
         # Scope filtering
-        scopes_param = request.query_params.getlist("scopes")
+        scopes_param = request.query_params.get("scopes")
         if scopes_param:
 
             # Transform url safe scope ids to regular ids
-            scopes = [scope.replace("_", "/").upper() for scope in scopes_param]
+            scopes = [scope.replace("_", "/").upper() for scope in scopes_param.split(",")]
             dataset_schema = DatasetSchema.filter_on_scopes(dataset_schema, scopes)
 
         try:

src/tests/test_views.py

@@ -34,7 +34,7 @@ def test_dataset_detail_filter_on_tables(self, client, gebieden_dataset):
             reverse(
                 "dataset-detail",
                 kwargs={"name": "gebieden"},
-                query={"tables": ["bouwblokken", "buurten", "wijken"]},
+                query={"tables": "bouwblokken,buurten,wijken"},
             ),
         )
         assert response.status_code == 200
@@ -46,7 +46,7 @@ def test_dataset_detail_filter_on_tables_ignores_non_existent(self, client, gebi
             reverse(
                 "dataset-detail",
                 kwargs={"name": "gebieden"},
-                query={"tables": ["bouwblokken", "buurten", "wijken", "huisnummerplaten"]},
+                query={"tables": "bouwblokken,buurten,wijken,huisnummerplaten"},
             ),
         )
         assert response.status_code == 200
@@ -65,7 +65,7 @@ def test_dataset_version_filter_on_tables(self, client, gebieden_dataset):
             reverse(
                 "dataset-version",
                 kwargs={"name": "gebieden", "vmajor": "v1"},
-                query={"tables": ["bouwblokken", "buurten", "wijken"]},
+                query={"tables": "bouwblokken,buurten,wijken"},
             ),
         )
         assert response.status_code == 200
@@ -140,12 +140,13 @@ def test_dataset_multiple_scope_access(self, client, bomen_dataset, scope_fixtur
                     "name": "bomen",
                 },
                 query={
-                    "scopes": ["openbaar", "fp_mdw"],
+                    "scopes": "openbaar,fp_mdw",
                 },
             ),
         )
         assert response.status_code == 200
-        assert response.data["versions"]["v1"]["tables"][0]["schema"]["properties"]
+        fields = set(response.data["versions"]["v1"]["tables"][0]["schema"]["properties"].keys())
+        assert fields == {"schema", "id", "groeiplaatsBoom", "guid", "begindatum"}
 
     def test_dataset_scope_version_access(self, client, bomen_dataset, scope_fixture):
         response = client.get(