Merge pull request #105 from GenomicDataInfrastructure/fix-filters

fix: remove fl attribute from ckan
GenomicDataInfrastructure · Aug 28, 2024 · 59f309a · 59f309a
2 parents 574fd55 + d0fed1f
commit 59f309a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/...structure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetIdsCollector.java b/...structure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetIdsCollector.java
@@ -37,7 +37,6 @@ public List<String> collect(DatasetSearchQuery query, String accessToken) {
         var response = ckanQueryApi.packageSearch(
                 query.getQuery(),
                 facetsQuery,
-                CKAN_IDENTIFIER_FIELD,
                 null,
                 CKAN_PAGINATION_MAX_SIZE,
                 0,

diff --git a/...astructure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetsRepository.java b/...astructure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetsRepository.java
@@ -72,7 +72,6 @@ public List<SearchedDataset> search(List<String> datasetIds,
         var response = ckanQueryApi.packageSearch(
                 null,
                 facetsQuery,
-                null,
                 sort,
                 rows,
                 start,

diff --git a/...ainfrastructure/discovery/datasets/infrastructure/ckan/persistence/CkanFacetsBuilder.java b/...ainfrastructure/discovery/datasets/infrastructure/ckan/persistence/CkanFacetsBuilder.java
@@ -44,7 +44,6 @@ public FacetGroup build(DatasetSearchQuery query, String accessToken) {
                 null,
                 null,
                 null,
-                null,
                 selectedFacets,
                 accessToken
         );

diff --git a/src/main/openapi/ckan.yaml b/src/main/openapi/ckan.yaml
@@ -30,12 +30,6 @@ paths:
           required: false
           schema:
             type: string
-        - name: fl
-          in: query
-          description: dataset fields to be returned
-          required: false
-          schema:
-            type: string
         - name: sort
           in: query
           description: Sorting of search results

diff --git a/src/test/resources/mappings/package_search_ids.json b/src/test/resources/mappings/package_search_ids.json
@@ -2,7 +2,7 @@
     "priority": 3,
     "request": {
         "method": "GET",
-        "urlPattern": "/api/3/action/enhanced_package_search.*fl=identifier.*"
+        "urlPattern": "/api/3/action/enhanced_package_search.*q=.*&rows=.*"
     },
     "response": {
         "status": 200,
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,6 @@ public List<SearchedDataset> search(List<String> datasetIds, @@
             var response = ckanQueryApi.packageSearch(
                     null,
                     facetsQuery,
-                    null,
                     sort,
                     rows,
                     start,
@@ Expand Down @@