fix: only return dataset with valid offers (#4490) (#4491)

* fix: only return dataset with valid offers (#4490) * fix: only return dataset with valid offers * test: add additional test * dependencies --------- Co-authored-by: Ronja Quensel <[email protected]>
eclipse-edc · Sep 25, 2024 · ad00f2a · ad00f2a
1 parent a6138aa
commit ad00f2a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 1 deletion.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -195,7 +195,7 @@ maven/mavencentral/net.javacrumbs.json-unit/json-unit-core/2.36.0, Apache-2.0, a
 maven/mavencentral/net.minidev/accessors-smart/2.4.7, Apache-2.0, approved, #7515
 maven/mavencentral/net.minidev/json-smart/2.4.7, Apache-2.0, approved, #3288
 maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.4, MIT, approved, CQ13174
-maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, MPL-2.0-no-copyleft-exception AND (LicenseRef-scancode-proprietary-license AND MPL-2.0-no-copyleft-exception) AND (MPL-2.0-no-copyleft-exception AND X11) AND (MIT AND MPL-2.0-no-copyleft-exception) AND (MPL-1.0 AND MPL-2.0-no-copyleft-exception) AND (Apache-2.0 AND MPL-2.0-no-copyleft-exception) AND MPL-1.0, restricted, #16061
+maven/mavencentral/net.sf.saxon/Saxon-HE/12.5, W3C-19980720 AND MPL-2.0 AND MPL-1.0, approved, #16061
 maven/mavencentral/org.antlr/antlr4-runtime/4.13.2, BSD-3-Clause, approved, #10767
 maven/mavencentral/org.apache.commons/commons-compress/1.24.0, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, #10368
 maven/mavencentral/org.apache.commons/commons-digester3/3.2, Apache-2.0, approved, clearlydefined

diff --git a/...log/src/main/java/org/eclipse/edc/connector/controlplane/catalog/DatasetResolverImpl.java b/...log/src/main/java/org/eclipse/edc/connector/controlplane/catalog/DatasetResolverImpl.java
@@ -62,6 +62,10 @@ public DatasetResolverImpl(ContractDefinitionResolver contractDefinitionResolver
     @NotNull
     public Stream<Dataset> query(ParticipantAgent agent, QuerySpec querySpec) {
         var contractDefinitions = contractDefinitionResolver.definitionsFor(agent).toList();
+        if (contractDefinitions.isEmpty()) {
+            return Stream.empty();
+        }
+
         var assetsQuery = QuerySpec.Builder.newInstance().offset(0).limit(MAX_VALUE).filter(querySpec.getFilterExpression()).build();
         return assetIndex.queryAssets(assetsQuery)
                 .map(asset -> toDataset(contractDefinitions, asset))
@@ -73,9 +77,14 @@ public Stream<Dataset> query(ParticipantAgent agent, QuerySpec querySpec) {
     @Override
     public Dataset getById(ParticipantAgent agent, String id) {
         var contractDefinitions = contractDefinitionResolver.definitionsFor(agent).toList();
+        if (contractDefinitions.isEmpty()) {
+            return null;
+        }
+
         return Optional.of(id)
                 .map(assetIndex::findById)
                 .map(asset -> toDataset(contractDefinitions, asset))
+                .filter(Dataset::hasOffers)
                 .orElse(null);
     }
 

diff --git a/...src/test/java/org/eclipse/edc/connector/controlplane/catalog/DatasetResolverImplTest.java b/...src/test/java/org/eclipse/edc/connector/controlplane/catalog/DatasetResolverImplTest.java
@@ -56,6 +56,7 @@
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -98,6 +99,16 @@ void search_shouldReturnOneDatasetPerAsset() {
             assertThat(dataset.getProperties()).contains(entry("key", "value"));
         });
     }
+
+    @Test
+    void query_shouldNotQueryAssets_whenNoValidContractDefinition() {
+        when(contractDefinitionResolver.definitionsFor(any())).thenReturn(Stream.empty());
+
+        var datasets = datasetResolver.query(createParticipantAgent(), QuerySpec.none());
+
+        assertThat(datasets).isNotNull().isEmpty();
+        verify(assetIndex, never()).queryAssets(any());
+    }
 
     @Test
     void query_shouldReturnNoDataset_whenPolicyNotFound() {
@@ -295,6 +306,39 @@ void getById_shouldReturnNull_whenAssetNotFound() {
 
         assertThat(dataset).isNull();
     }
+
+    @Test
+    void getById_shouldReturnNull_whenNoValidContractDefinition() {
+        var participantAgent = createParticipantAgent();
+
+        when(contractDefinitionResolver.definitionsFor(any())).thenReturn(Stream.empty());
+
+        var dataset = datasetResolver.getById(participantAgent, "datasetId");
+
+        assertThat(dataset).isNull();
+        verify(assetIndex, never()).findById(any());
+    }
+
+    @Test
+    void getById_shouldReturnNull_whenNoValidContractDefinitionForAsset() {
+        var assetId = "assetId";
+        var participantAgent = createParticipantAgent();
+
+        when(contractDefinitionResolver.definitionsFor(any())).thenReturn(Stream.of(
+                contractDefinitionBuilder("definition")
+                        .assetsSelectorCriterion(Criterion.Builder.newInstance()
+                                .operandRight(EDC_NAMESPACE + "id")
+                                .operator("=")
+                                .operandLeft("a-different-asset")
+                                .build())
+                        .build()
+        ));
+        when(assetIndex.findById(any())).thenReturn(createAsset(assetId).build());
+
+        var dataset = datasetResolver.getById(participantAgent, assetId);
+
+        assertThat(dataset).isNull();
+    }
 
     private ContractDefinition.Builder contractDefinitionBuilder(String id) {
         return ContractDefinition.Builder.newInstance()