fix(policy-validation):[eclipse-tractusx#649] trial to fix

- but results in failures in PolicyCheckerServiceTest
dsmf · Jul 10, 2024 · be349ac · be349ac
1 parent da3bc67
commit be349ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...nt/src/main/java/org/eclipse/tractusx/irs/edc/client/policy/ConstraintCheckerService.java b/...nt/src/main/java/org/eclipse/tractusx/irs/edc/client/policy/ConstraintCheckerService.java
@@ -54,7 +54,7 @@ public boolean hasAllConstraint(final Policy acceptedPolicy, final List<Constrai
 
     private boolean isValidOnList(final Constraint constraint, final List<Constraints> acceptedConstraintsList) {
         return acceptedConstraintsList.stream()
-                                      .anyMatch(acceptedConstraints -> isSameAs(constraint, acceptedConstraints));
+                                      .allMatch(acceptedConstraints -> isSameAs(constraint, acceptedConstraints));
     }
 
     private boolean isSameAs(final Constraint constraint, final Constraints acceptedConstraints) {

diff --git a/...rc/test/java/org/eclipse/tractusx/irs/edc/client/policy/ConstraintCheckerServiceTest.java b/...rc/test/java/org/eclipse/tractusx/irs/edc/client/policy/ConstraintCheckerServiceTest.java
@@ -113,6 +113,25 @@ void shouldNotAcceptAndConstraintWithOneLessElement() {
         assertThat(result).isFalse();
     }
 
+    @Test
+    void shouldNotAcceptSubsetOfAndConstraints() {
+
+        final AndConstraint andConstraint = createAndConstraint(
+                List.of(createAtomicConstraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+                                TestConstants.STATUS_ACTIVE),
+                        createAtomicConstraint(TestConstants.MEMBERSHIP, TestConstants.STATUS_ACTIVE),
+                        createAtomicConstraint(TestConstants.PURPOSE, TestConstants.ID_3_1_TRACE)));
+
+        final Policy acceptedPolicy = createPolicyWithAndConstraint(
+                List.of(new Operand(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, TestConstants.STATUS_ACTIVE),
+                        //                        new Operand(TestConstants.MEMBERSHIP, TestConstants.STATUS_ACTIVE),
+                        new Operand(TestConstants.PURPOSE, TestConstants.ID_3_1_TRACE)));
+
+        boolean result = cut.hasAllConstraint(acceptedPolicy, List.of(andConstraint));
+
+        assertThat(result).isFalse();
+    }
+
     @Test
     void shouldRejectAndConstraintWhenOneIsDifferent() {
         final AndConstraint andConstraint = createAndConstraint(