[basicprofiles] Fix handling of multiple $DELTA conditions (openhab#18088)

Signed-off-by: Jimmy Tanagra <[email protected]>

Author: jimtng

bundles/org.openhab.transform.basicprofiles/src/main/java/org/openhab/transform/basicprofiles/internal/profiles/StateFilterProfile.java

@@ -230,6 +230,7 @@ private State checkCondition(State state) {
         }
 
         if (conditions.stream().allMatch(c -> c.check(state))) {
+            acceptedState = state;
             return state;
         } else {
             return configMismatchState;
@@ -349,7 +350,6 @@ public boolean check(State input) {
                 } else if (rhsState instanceof FunctionType rhsFunction) {
                     if (acceptedState == UnDefType.UNDEF && (rhsFunction.getType() == FunctionType.Function.DELTA
                             || rhsFunction.getType() == FunctionType.Function.DELTA_PERCENT)) {
-                        acceptedState = input;
                         return true;
                     }
                     rhsItem = getLinkedItem();
@@ -371,7 +371,6 @@ public boolean check(State input) {
                 } else if (lhsState instanceof FunctionType lhsFunction) {
                     if (acceptedState == UnDefType.UNDEF && (lhsFunction.getType() == FunctionType.Function.DELTA
                             || lhsFunction.getType() == FunctionType.Function.DELTA_PERCENT)) {
-                        acceptedState = input;
                         return true;
                     }
                     lhsItem = getLinkedItem();
@@ -444,10 +443,6 @@ public boolean check(State input) {
                     case LTE -> ((Comparable) lhs).compareTo(rhs) <= 0;
                 };
 
-                if (result) {
-                    acceptedState = input;
-                }
-
                 return result;
             } catch (IllegalArgumentException | ClassCastException e) {
                 logger.warn("Error evaluating condition: {} in link '{}': {}", this, callback.getItemChannelLink(),

bundles/org.openhab.transform.basicprofiles/src/test/java/org/openhab/transform/basicprofiles/internal/profiles/StateFilterProfileTest.java

@@ -690,6 +690,10 @@ public static Stream<Arguments> testFunctions() {
                 Arguments.of(decimalItem, "$DELTA >= 1", decimals, DecimalType.valueOf("10"), true), //
                 Arguments.of(decimalItem, "$DELTA >= 1", decimals, DecimalType.valueOf("5.5"), false), //
 
+                // Multiple delta conditions
+                Arguments.of(decimalItem, "$DELTA >= 1, $DELTA <= 10", decimals, DecimalType.valueOf("15"), true), //
+                Arguments.of(decimalItem, "$DELTA >= 1, $DELTA <= 10", decimals, DecimalType.valueOf("16"), false), //
+
                 Arguments.of(decimalItem, "$DELTA_PERCENT >= 10", decimals, DecimalType.valueOf("4.6"), false), //
                 Arguments.of(decimalItem, "$DELTA_PERCENT >= 10", decimals, DecimalType.valueOf("4.5"), true), //
                 Arguments.of(decimalItem, "$DELTA_PERCENT >= 10", decimals, DecimalType.valueOf("5.4"), false), //