From a6eb57b09506f83b7014943daf395022b481a940 Mon Sep 17 00:00:00 2001
From: ds-lcapellino <lucas.capellino@doubleslash.de>
Date: Thu, 7 Mar 2024 10:08:36 +0100
Subject: [PATCH] feature: 420 fix filterExpression

---
 .../contract/model/EdcContractAgreementRequest.java       | 4 ++--
 .../contract/service/EdcContractAgreementService.java     | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementRequest.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementRequest.java
index fd6e9f9319..cef9e6aece 100644
--- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementRequest.java
+++ b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementRequest.java
@@ -27,7 +27,7 @@
  * EdcContractAgreementRequest represents the request to management/v2/contractagreements/request
  */
 public record EdcContractAgreementRequest(@JsonProperty(
-        "https://w3id.org/edc/v0.0.1/ns/filterExpression") List<EdcContractAgreementFilterExpression> edcContractAgreementFilterExpressions) {
+        "https://w3id.org/edc/v0.0.1/ns/filterExpression") EdcContractAgreementFilterExpression edcContractAgreementFilterExpressions) {
     /**
      * EdcContractAgreementFilterExpression represents the filterExpression
      * for EdcContractAgreementRequest
@@ -35,7 +35,7 @@ public record EdcContractAgreementRequest(@JsonProperty(
     public record EdcContractAgreementFilterExpression(
             @JsonProperty("https://w3id.org/edc/v0.0.1/ns/operandLeft") String operandLeft,
             @JsonProperty("https://w3id.org/edc/v0.0.1/ns/operator") String operator,
-            @JsonProperty("https://w3id.org/edc/v0.0.1/ns/operandRight") String operandRight) {
+            @JsonProperty("https://w3id.org/edc/v0.0.1/ns/operandRight") List<String> operandRight) {
 
     }
 }
diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementService.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementService.java
index d0b82407ba..149f9debaf 100644
--- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementService.java
+++ b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementService.java
@@ -90,12 +90,10 @@ public EdcContractAgreementNegotiationResponse getContractAgreementNegotiation(f
 
     private EdcContractAgreementRequest buildContractAgreementRequest(final List<String> contractAgreementIds) {
 
-        final List<EdcContractAgreementFilterExpression> list = contractAgreementIds.stream()
-                                                                      .map(s -> new EdcContractAgreementFilterExpression(
-                                                                              EDC_CONTRACT_AGREEMENT_ID, "=", s))
-                                                                      .toList();
+        final EdcContractAgreementFilterExpression edcContractAgreementFilterExpression = new EdcContractAgreementFilterExpression(
+                EDC_CONTRACT_AGREEMENT_ID, "in", contractAgreementIds);
 
-        return new EdcContractAgreementRequest(list);
+        return new EdcContractAgreementRequest(edcContractAgreementFilterExpression);
     }
 
     private HttpHeaders headers() {