extensions compilation ok

sovity · Oct 10, 2024 · d05ba04 · d05ba04
1 parent 7b9a2ea
commit d05ba04
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/docs/api/sovity-edc-api-wrapper.yaml b/docs/api/sovity-edc-api-wrapper.yaml
@@ -275,6 +275,10 @@ paths:
       description: Fetch a connector's data offers
       operationId: getCatalogPageDataOffers
       parameters:
+      - name: participantId
+        in: query
+        schema:
+          type: string
       - name: connectorEndpoint
         in: query
         schema:

diff --git a/...r/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java b/...r/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/asset/AssetApiService.java
@@ -64,7 +64,7 @@ public IdResponseDto editAsset(String assetId, UiAssetEditRequest request) {
         Objects.requireNonNull(foundAsset, "Asset with ID %s not found".formatted(assetId));
         val editedAsset = assetMapper.editAsset(foundAsset, request);
         val updatedAsset = assetService.update(editedAsset).orElseThrow(ServiceException::new);
-        assetService.update(editedAsset.getId(), editedAsset.getDataAddress());
+        assetService.update(editedAsset);
         return new IdResponseDto(updatedAsset.getId());
     }
 

diff --git a/...sovity/edc/ext/wrapper/api/ui/pages/contract_negotiations/ContractNegotiationBuilder.java b/...sovity/edc/ext/wrapper/api/ui/pages/contract_negotiations/ContractNegotiationBuilder.java
@@ -31,7 +31,9 @@ public ContractRequest buildContractNegotiation(ContractNegotiationRequest reque
 
         return ContractRequest.Builder.newInstance()
                 .counterPartyAddress(counterPartyAddress)
-                .providerId(request.getCounterPartyParticipantId())
+                // TODO: deprecated and moved into the contractOffer.policy.assigner, set by `.contractOffer()` below
+                //  git diff v0.5.1..v0.6.0 -- spi/control-plane/contract-spi/src/main/java/org/eclipse/edc/connector/contract/spi/types/negotiation/ContractRequest.java
+//                 .providerId(request.getCounterPartyParticipantId())
                 .protocol(HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP)
                 .contractOffer(contractOfferMapper.buildContractOffer(request))
                 .build();

diff --git a/...in/java/de/sovity/edc/ext/wrapper/api/usecase/pages/catalog/UseCaseCatalogApiService.java b/...in/java/de/sovity/edc/ext/wrapper/api/usecase/pages/catalog/UseCaseCatalogApiService.java
@@ -32,7 +32,10 @@ public class UseCaseCatalogApiService {
     public List<UiDataOffer> fetchDataOffers(CatalogQuery catalogQuery) {
         var querySpec = buildQuerySpec(catalogQuery);
 
-        var dspCatalog = dspCatalogService.fetchDataOffersWithFilters(catalogQuery.getConnectorEndpoint(), querySpec);
+        var dspCatalog = dspCatalogService.fetchDataOffersWithFilters(
+            catalogQuery.getParticipantId(),
+            catalogQuery.getConnectorEndpoint(),
+            querySpec);
         return uiDataOfferBuilder.buildUiDataOffers(dspCatalog);
     }