fix(contract-check): fixed bug with contract filter

eclipse-tractusx · May 12, 2024 · a34cc1e · a34cc1e
1 parent 9000e7a
commit a34cc1e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/.../src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/policy/Set.java b/.../src/main/java/org/eclipse/tractusx/digitalproductpass/models/negotiation/policy/Set.java
@@ -167,22 +167,7 @@ static public Set build(Object rawPolicy){
 
             // Check if its null
             if(permission == null || prohibition == null || obligation == null){
-                if (permission != null) {
-                    LogUtil.printMessage("DEBUG: Permission: "+ permission.toPrettyString());
-                }else{
-                    LogUtil.printMessage("DEBUG: Permission is null!");
-                }
-                if (prohibition != null) {
-                    LogUtil.printMessage("DEBUG: Prohibition: "+ prohibition.toPrettyString());
-                }else{
-                    LogUtil.printMessage("DEBUG: Prohibition is null!");
-                }
-                if (obligation != null) {
-                    LogUtil.printMessage("DEBUG: Obligation: "+ obligation.toPrettyString());
-                }else{
-                    LogUtil.printMessage("DEBUG: Obligation is null!");
-                }
-                throw new ModelException(Set.class.getName(), "One of the mandatory fields where not found!");
+                throw new ModelException(Set.class.getName(), "One of the mandatory fields where not found! This is not a valid policy set!");
             }
             // Check if all them are array then parse as default
             if(permission.isArray() && prohibition.isArray() && obligation.isArray()){

diff --git a/...s/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataTransferService.java b/...s/src/main/java/org/eclipse/tractusx/digitalproductpass/services/DataTransferService.java
@@ -432,7 +432,6 @@ public NegotiationRequest buildRequest(Dataset dataset, String endpoint, String
      *
      */
     public Set selectPolicyByIndex(Object policies, Integer defaultIndex){
-        Set policy = null;
         if(policies instanceof LinkedHashMap){
             return Set.build(policies);
         }

diff --git a/dpp-backend/digitalproductpass/src/main/java/utils/EdcUtil.java b/dpp-backend/digitalproductpass/src/main/java/utils/EdcUtil.java
@@ -206,7 +206,7 @@ public Map<String, Dataset> filterValidContracts(Map<String, Dataset> contracts,
      */
     public Boolean isContractValid(Dataset contract, PolicyCheckConfig policyConfig){
         try {
-            return policyUtil.getValidPoliciesByConstraints(contract, policyConfig).size() > 0; // If any policy is found the contract is valid
+            return policyUtil.getValidPoliciesByConstraints(contract.getPolicy(), policyConfig).size() > 0; // If any policy is found the contract is valid
         } catch (Exception e) {
             throw new UtilException(EdcUtil.class, e, "It was not possible to check if contract is valid");
         }