fix(backend): fixed policy action type

eclipse-tractusx · Jul 17, 2024 · 8025103 · 8025103
1 parent 4edcac3
commit 8025103
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/dpp-backend/digitalproductpass/src/main/resources/application.yml b/dpp-backend/digitalproductpass/src/main/resources/application.yml
@@ -94,7 +94,7 @@ configuration:
       # List of allowed permissions policies
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"
@@ -156,7 +156,7 @@ configuration:
       strictMode: false
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"

diff --git a/dpp-backend/digitalproductpass/src/test/java/managers/ProcessManagerTest.java b/dpp-backend/digitalproductpass/src/test/java/managers/ProcessManagerTest.java
@@ -572,7 +572,7 @@ void saveTransferRequestAndTransfer() {
         transferRequest.setProtocol("HTTP");
         transferRequest.setContractId(contractId);
         transferRequest.setAssetId(assetId);
-        transferRequest.setConnectorAddress("connectorAddress");
+        transferRequest.setCounterPartyAddress("connectorAddress");
 
         String transferId = UUID.randomUUID().toString();
         Transfer transfer = new Transfer();

diff --git a/dpp-backend/digitalproductpass/src/test/java/utils/PolicyUtilTest.java b/dpp-backend/digitalproductpass/src/test/java/utils/PolicyUtilTest.java
@@ -165,13 +165,13 @@ void setUp() {
 
         correctLogicalConstraint.put("odrl:and", correctContraints);
 
-        action.put("odrl:action", new LinkedHashMap<>(){{put("odrl:type","USE");}});
+        action.put("odrl:action", new LinkedHashMap<>(){{put("@id","odrl:use");}});
         action.put("odrl:constraint", logicalConstraint);
 
-        correctAction.put("odrl:action", new LinkedHashMap<>(){{put("odrl:type","USE");}});
+        correctAction.put("odrl:action", new LinkedHashMap<>(){{put("@id","odrl:use");}});
         correctAction.put("odrl:constraint", correctLogicalConstraint);
 
-        actionDtr.put("odrl:action", new LinkedHashMap<>(){{put("odrl:type","USE");}});
+        actionDtr.put("odrl:action", new LinkedHashMap<>(){{put("@id","odrl:use");}});
         actionDtr.put("odrl:constraint", logicalConstraintDtr);
 
         singlePermission = correctAction;

diff --git a/dpp-backend/digitalproductpass/src/test/resources/application-test.yml b/dpp-backend/digitalproductpass/src/test/resources/application-test.yml
@@ -93,7 +93,7 @@ configuration:
       # List of allowed permissions policies
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"
@@ -174,7 +174,7 @@ configuration:
       strictMode: false # The strict mode is quicker and requires less computation complexity, the default mode is comparing against every single object value
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"