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

Jump to bottom

Fix adding parent after child in TransformToTree #230

Merged
merged 1 commit into from
Jun 10, 2019
Merged

Fix adding parent after child in TransformToTree #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 22 additions & 21 deletions DynamicData.Tests/Cache/TransformTreeFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,33 @@ public void AddMissingChild()
[Fact]
public void AddMissingParent()
{
var minion = new EmployeeDto(1) { BossId = 2, Name = "DogsBody" };
var boss = new EmployeeDto(2) { BossId = 0, Name = "Boss" };
var emp10 = new EmployeeDto(10) { BossId = 11, Name = "Employee10" };
var emp11 = new EmployeeDto(11) { BossId = 0, Name = "Employee11" };
var emp12 = new EmployeeDto(12) { BossId = 13, Name = "Employee12" };
var emp13 = new EmployeeDto(13) { BossId = 11, Name = "Employee13" };

_sourceCache.AddOrUpdate(boss);
_sourceCache.AddOrUpdate(minion);
_sourceCache.AddOrUpdate(emp10);
_sourceCache.AddOrUpdate(emp11);
_sourceCache.AddOrUpdate(emp12);
_sourceCache.AddOrUpdate(emp13);

_result.Count.Should().Be(1);

var firstNode = _result.Items.First();
firstNode.Item.Should().Be(boss);
var emp11Node = _result.Lookup(11);
emp11Node.HasValue.Should().BeTrue();
emp11Node.Value.Children.Count.Should().Be(2);

var childNode = firstNode.Children.Items.First();
childNode.Item.Should().Be(minion);
var emp10Node = emp11Node.Value.Children.Lookup(10);
emp10Node.HasValue.Should().BeTrue();
emp10Node.Value.Children.Count.Should().Be(0);

var emp13Node = emp11Node.Value.Children.Lookup(13);
emp13Node.HasValue.Should().BeTrue();
emp13Node.Value.Children.Count.Should().Be(1);

var emp12Node = emp13Node.Value.Children.Lookup(12);
emp12Node.HasValue.Should().BeTrue();
emp12Node.Value.Children.Count.Should().Be(0);
}

[Fact]
Expand All @@ -165,19 +179,6 @@ public void ChangeParent()
emp3.Children.Lookup(4).HasValue.Should().BeFalse();
}

[Fact]
public void AddParent()
{
_sourceCache.AddOrUpdate(new EmployeeDto(1) { BossId = 2, Name = "E1" });
_sourceCache.AddOrUpdate(new EmployeeDto(2) { BossId = 1, Name = "E2" });

//we expect the children of node 4 to be pushed up become new roots
_result.Count.Should().Be(1);

var firstNode = _result.Items.First();
firstNode.Item.Id.Should().Be(1);
}

[Fact]
public void UseCustomFilter()
{
Expand Down
19 changes: 19 additions & 0 deletions DynamicData/Cache/Internal/TreeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ public TreeBuilder([NotNull] IObservable<IChangeSet<TObject, TKey>> source, [Not
.Transform((t, v) => new Node<TObject, TKey>(t, v))
.AsObservableCache();

var groupedByPivot = allNodes.Connect()
.Synchronize(locker)
.Group(x => _pivotOn(x.Item))
.AsObservableCache();

void UpdateChildren(Node<TObject, TKey> parentNode)
{
var lookup = groupedByPivot.Lookup(parentNode.Key);
if (lookup.HasValue)
{
var children = lookup.Value.Cache.Items;
parentNode.Update(u => u.AddOrUpdate(children));
children.ForEach(x => x.Parent = parentNode);
}
}

//as nodes change, maintain parent and children
var parentSetter = allNodes.Connect()
.Do(changes =>
Expand All @@ -65,6 +81,7 @@ public TreeBuilder([NotNull] IObservable<IChangeSet<TObject, TKey>> source, [Not
switch (change.Reason)
{
case ChangeReason.Add:
UpdateChildren(change.Current);
break;
case ChangeReason.Update:
{
Expand Down Expand Up @@ -129,6 +146,7 @@ public TreeBuilder([NotNull] IObservable<IChangeSet<TObject, TKey>> source, [Not
// update the parent node
node.Parent = p;
updater.AddOrUpdate(node);
UpdateChildren(node);

break;
}
Expand Down Expand Up @@ -198,6 +216,7 @@ public TreeBuilder([NotNull] IObservable<IChangeSet<TObject, TKey>> source, [Not
parentSetter.Dispose();
allData.Dispose();
allNodes.Dispose();
groupedByPivot.Dispose();
refilterObservable.OnCompleted();
});
});
Expand Down