Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the WhenStateIsSame should not call action when completed #1134

Merged
merged 3 commits into from
Jul 7, 2024
Merged

Fix the WhenStateIsSame should not call action when completed #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a106e2f
Fix the WhenStateIsSame should not call action when completed
helto4real Jul 7, 2024
0a44263
better naming
helto4real Jul 7, 2024
f9dea5a
remove one where clause
helto4real Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/HassModel/NetDaemon.HassModel.Tests/StateObservableExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
10 changes: 8 additions & 2 deletions src/HassModel/NetDeamon.HassModel/StateObservableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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);
}
}
Loading