From b75c50ce114d5c3b1efabcc3f6ca75b8b020553b Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Mon, 11 Mar 2024 08:44:33 +0100 Subject: [PATCH 1/2] feature: 420 add policy to request --- .../contract/model/EdcContractAgreementsResponse.java | 3 ++- .../contract/service/EdcContractAgreementServiceTest.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java index cb22475adc..b64b4ffa64 100644 --- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java +++ b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java @@ -36,5 +36,6 @@ public record EdcContractAgreementsResponse(@JsonProperty("@id") String contract @JsonProperty("edc:consumerId") String consumerId, @JsonProperty("edc:contractSigningDate") long contractSigningDate, @JsonProperty("edc:assetId") String assetId, - @JsonProperty("@type") String type) { + @JsonProperty("@type") String type, + @JsonProperty("edc:policy") String policy) { } diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java index 7af50f54a5..581138d21a 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java @@ -69,10 +69,12 @@ void shouldReturnContractAgreements() throws ContractAgreementException { List contractAgreementIds = List.of("contractAgreementId"); final EdcContractAgreementsResponse[] edcContractAgreementsResponse = new EdcContractAgreementsResponse[1]; - edcContractAgreementsResponse[0] = EdcContractAgreementsResponse.builder().contractAgreementId("id") + edcContractAgreementsResponse[0] = EdcContractAgreementsResponse.builder() + .contractAgreementId("id") .assetId("assetId") .consumerId("consumerId") .providerId("providerId") + .policy("theProvidedPolicy") .build(); when(restTemplate.exchange(anyString(), eq(HttpMethod.POST), any(), eq(EdcContractAgreementsResponse[].class))).thenReturn( @@ -88,6 +90,8 @@ void shouldReturnContractAgreements() throws ContractAgreementException { eq("https://irs-consumer-controlplane.dev.demo.net/data/management/v2/contractagreements/request"), any(), any(), eq(EdcContractAgreementsResponse[].class)); assertThat(contractAgreements).isNotNull(); + assertThat(contractAgreements.get(0).policy()).isNotEmpty(); + } @Test From 7451694b1c327aca44df1f5d654352fa64966123 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Mon, 11 Mar 2024 10:04:19 +0100 Subject: [PATCH 2/2] feature: 420 add policy to request --- .../client/contract/model/EdcContractAgreementsResponse.java | 2 +- .../contract/service/EdcContractAgreementServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java index b64b4ffa64..0f31f088eb 100644 --- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java +++ b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java @@ -37,5 +37,5 @@ public record EdcContractAgreementsResponse(@JsonProperty("@id") String contract @JsonProperty("edc:contractSigningDate") long contractSigningDate, @JsonProperty("edc:assetId") String assetId, @JsonProperty("@type") String type, - @JsonProperty("edc:policy") String policy) { + @JsonProperty("edc:policy") Object policy) { } diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java index 581138d21a..4ef37bea78 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java @@ -90,7 +90,7 @@ void shouldReturnContractAgreements() throws ContractAgreementException { eq("https://irs-consumer-controlplane.dev.demo.net/data/management/v2/contractagreements/request"), any(), any(), eq(EdcContractAgreementsResponse[].class)); assertThat(contractAgreements).isNotNull(); - assertThat(contractAgreements.get(0).policy()).isNotEmpty(); + assertThat(contractAgreements.get(0).policy()).isNotNull(); }