Fix the WhenStateIsSame should not call action when completed (#1134)

* Fix the WhenStateIsSame should not call action when completed * better naming * remove one where clause
net-daemon · Jul 7, 2024 · 11db230 · 11db230
1 parent 9712288
commit 11db230
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/HassModel/NetDaemon.HassModel.Tests/StateObservableExtensionsTest.cs b/src/HassModel/NetDaemon.HassModel.Tests/StateObservableExtensionsTest.cs
@@ -20,6 +20,34 @@ public StateObservableExtensionsTest()
                                                                     EntityState.Map<NumericEntityState>(e.New)));
     }
 
+    [Fact]
+    public void TestThatWhenStateIsForDoesNotCallActionWhenCompleted()
+    {
+        bool isCalled = false;
+
+        _subject.WhenStateIsFor(n => n?.State == "off", TimeSpan.FromSeconds(10), _testScheduler).Subscribe(_ => { isCalled = true;});
+
+        _subject.OnNext(new StateChange(new Entity(new Mock<IHaContext>().Object, ""), new EntityState { State = "on" }, new EntityState { State = "off" }));
+
+        _subject.OnCompleted();
+
+        isCalled.Should().BeFalse();
+    }
+
+    [Fact]
+    public void TestNumericEntityWhenStateIsForDoesNotCallActionWhenCompleted()
+    {
+        bool isCalled = false;
+
+        _numericStateChangeObservable.WhenStateIsFor(n => n?.State > 20, TimeSpan.FromSeconds(10), _testScheduler).Subscribe(_ => { isCalled = true;});
+
+        _subject.OnNext(new StateChange(new Entity(new Mock<IHaContext>().Object, ""), new EntityState { State = "1" }, new EntityState { State = "30" }));
+
+        _subject.OnCompleted();
+
+        isCalled.Should().BeFalse();
+    }
+
     [Fact]
     public void WhenNumStateIsForFiresInTime()
     {

diff --git a/src/HassModel/NetDeamon.HassModel/StateObservableExtensions.cs b/src/HassModel/NetDeamon.HassModel/StateObservableExtensions.cs
@@ -42,15 +42,18 @@ public static IObservable<StateChange> WhenStateIsFor(
         ArgumentNullException.ThrowIfNull(predicate, nameof(predicate));
         ArgumentNullException.ThrowIfNull(scheduler, nameof(scheduler));
 
+        var isCompleted = false;
+
         return observable
+            .Do(_ => {}, () => isCompleted = true)
             // Only process changes that start or stop matching the predicate
             .Where(e => predicate(e.Old) != predicate(e.New))
 
             // Both  will restart the timer
             .Throttle(timeSpan, scheduler)
 
             // But only when the new state matches the predicate we emit it
-            .Where(e => predicate(e.New));
+            .Where(e => predicate(e.New) && isCompleted == false);
     }
 
     /// <summary>
@@ -68,9 +71,12 @@ public static IObservable<StateChange<TEntity, TEntityState>> WhenStateIsFor<TEn
         ArgumentNullException.ThrowIfNull(predicate, nameof(predicate));
         ArgumentNullException.ThrowIfNull(scheduler, nameof(scheduler));
 
+        var isCompleted = false;
+
         return observable
+            .Do(_ => {}, () => isCompleted = true)
             .Where(e => predicate(e.Old) != predicate(e.New))
             .Throttle(timeSpan, scheduler)
-            .Where(e => predicate(e.New));
+            .Where(e => predicate(e.New) && isCompleted == false);
     }
 }