Revert "32/remove logic from repository"

GenomicDataInfrastructure · Aug 27, 2024 · fe821f4 · fe821f4
1 parent 483edd5
commit fe821f4
Show file tree

Hide file tree

Showing 34 changed files with 3,554 additions and 1,061 deletions.
diff --git a/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java b/src/main/java/io/github/genomicdatainfrastructure/discovery/api/DatasetQueryApiImpl.java
@@ -4,9 +4,9 @@
 
 package io.github.genomicdatainfrastructure.discovery.api;
 
-import io.github.genomicdatainfrastructure.discovery.datasets.application.usecases.SearchDatasetsQuery;
 import io.github.genomicdatainfrastructure.discovery.model.DatasetSearchQuery;
 import io.github.genomicdatainfrastructure.discovery.services.RetrieveDatasetService;
+import io.github.genomicdatainfrastructure.discovery.services.SearchDatasetsService;
 import io.quarkus.oidc.runtime.OidcJwtCallerPrincipal;
 import io.quarkus.security.identity.SecurityIdentity;
 import jakarta.ws.rs.core.Response;
@@ -16,12 +16,12 @@
 public class DatasetQueryApiImpl implements DatasetQueryApi {
 
     private final SecurityIdentity identity;
+    private final SearchDatasetsService searchDatasetsService;
     private final RetrieveDatasetService retrievedDatasetService;
-    private final SearchDatasetsQuery searchDatasetsQuery;
 
     @Override
     public Response datasetSearch(DatasetSearchQuery datasetSearchQuery) {
-        var content = searchDatasetsQuery.execute(datasetSearchQuery, accessToken());
+        var content = searchDatasetsService.search(datasetSearchQuery, accessToken());
         return Response.ok(content).build();
     }
 

diff --git a/...b/genomicdatainfrastructure/discovery/datasets/application/ports/DatasetIdsCollector.java b/...b/genomicdatainfrastructure/discovery/datasets/application/ports/DatasetIdsCollector.java
diff --git a/...ub/genomicdatainfrastructure/discovery/datasets/application/ports/DatasetsRepository.java b/...ub/genomicdatainfrastructure/discovery/datasets/application/ports/DatasetsRepository.java
diff --git a/.../github/genomicdatainfrastructure/discovery/datasets/application/ports/FacetsBuilder.java b/.../github/genomicdatainfrastructure/discovery/datasets/application/ports/FacetsBuilder.java
diff --git a/...genomicdatainfrastructure/discovery/datasets/application/ports/RecordsCountCollector.java b/...genomicdatainfrastructure/discovery/datasets/application/ports/RecordsCountCollector.java
diff --git a/...enomicdatainfrastructure/discovery/datasets/application/usecases/SearchDatasetsQuery.java b/...enomicdatainfrastructure/discovery/datasets/application/usecases/SearchDatasetsQuery.java
diff --git a/...b/genomicdatainfrastructure/discovery/datasets/infrastructure/beacon/auth/BeaconAuth.java b/...b/genomicdatainfrastructure/discovery/datasets/infrastructure/beacon/auth/BeaconAuth.java
diff --git a/...cture/discovery/datasets/infrastructure/beacon/persistence/BeaconDatasetIdsCollector.java b/...cture/discovery/datasets/infrastructure/beacon/persistence/BeaconDatasetIdsCollector.java
diff --git a/...rastructure/discovery/datasets/infrastructure/beacon/persistence/BeaconFacetsBuilder.java b/...rastructure/discovery/datasets/infrastructure/beacon/persistence/BeaconFacetsBuilder.java
diff --git a/...icdatainfrastructure/discovery/datasets/infrastructure/ckan/config/CkanConfiguration.java b/...icdatainfrastructure/discovery/datasets/infrastructure/ckan/config/CkanConfiguration.java