Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ckan client api #100

Closed
wants to merge 1 commit into from
Closed

fix: ckan client api #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ub/genomicdatainfrastructure/discovery/datasets/application/ports/DatasetsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
public interface DatasetsRepository {

List<SearchedDataset> search(List<String> datasetIds,
String returnFields,
String sort,
Integer rows,
Integer start,
Expand Down
1 change: 0 additions & 1 deletion ...enomicdatainfrastructure/discovery/datasets/application/usecases/SearchDatasetsQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public DatasetsSearchResponse execute(DatasetSearchQuery query, String accessTok
.orElse(List.of());

var datasets = repository.search(datasetIds,
query.getReturnFields(),
query.getSort(),
query.getRows(),
query.getStart(),
Expand Down
4 changes: 2 additions & 2 deletions ...structure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetIdsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public List<String> collect(DatasetSearchQuery query, String accessToken) {
query.getQuery(),
facetsQuery,
CKAN_IDENTIFIER_FIELD,
"",
null,
CKAN_PAGINATION_MAX_SIZE,
0,
"",
null,
accessToken
);

Expand Down
7 changes: 3 additions & 4 deletions ...astructure/discovery/datasets/infrastructure/ckan/persistence/CkanDatasetsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public CkanDatasetsRepository(

@Override
public List<SearchedDataset> search(List<String> datasetIds,
String returnFields,
String sort,
Integer rows,
Integer start,
Expand All @@ -71,13 +70,13 @@ public List<SearchedDataset> search(List<String> datasetIds,
.build());

var response = ckanQueryApi.packageSearch(
"",
null,
facetsQuery,
returnFields,
null,
sort,
rows,
start,
"",
null,
accessToken
);

Expand Down
8 changes: 4 additions & 4 deletions ...ainfrastructure/discovery/datasets/infrastructure/ckan/persistence/CkanFacetsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public FacetGroup build(DatasetSearchQuery query, String accessToken) {
var response = ckanQueryApi.packageSearch(
query.getQuery(),
facetsQuery,
query.getReturnFields(),
query.getSort(),
0,
query.getStart(),
null,
null,
null,
null,
selectedFacets,
accessToken
);
Expand Down
4 changes: 0 additions & 4 deletions src/main/openapi/discovery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,6 @@ components:
title: Facets
items:
$ref: "#/components/schemas/DatasetSearchQueryFacet"
returnFields:
type: string
title: dataset fields to return
default: "*"
sort:
type: string
title: Sorting of search results
Expand Down
Loading