Skip to content

Commit fd354d6

Browse files
bkoelmanbkoelman
committed
WIP: Investigating fix for #1118 
1 parent 79d918a commit fd354d6

File tree

10 files changed

+318
-1
lines changed

10 files changed

+318
-1
lines changed

‎src/JsonApiDotNetCore/Repositories/DbContextExtensions.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Reflection;
12
using JetBrains.Annotations;
23
using JsonApiDotNetCore.Resources;
34
using Microsoft.EntityFrameworkCore;
@@ -8,6 +9,8 @@ namespace JsonApiDotNetCore.Repositories;
89
[PublicAPI]
910
public static class DbContextExtensions
1011
{
12+
private static readonly MethodInfo DbContextSetMethod = typeof(DbContext).GetMethod(nameof(DbContext.Set), Type.EmptyTypes)!;
13+
1114
/// <summary>
1215
/// If not already tracked, attaches the specified resource to the change tracker in <see cref="EntityState.Unchanged" /> state.
1316
/// </summary>
@@ -57,4 +60,10 @@ public static void ResetChangeTracker(this DbContext dbContext)
5760

5861
dbContext.ChangeTracker.Clear();
5962
}
63+
64+
public static IQueryable Set(this DbContext context, Type entityType)
65+
{
66+
MethodInfo setMethod = DbContextSetMethod.MakeGenericMethod(entityType);
67+
return (IQueryable)setMethod.Invoke(context, null)!;
68+
}
6069
}

‎src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
325325

326326
var resourceTracked = (TResource)_dbContext.GetTrackedOrAttach(placeholderResource);
327327

328+
EnsureIncomingNavigationsAreTracked(resourceTracked);
329+
330+
/*
328331
foreach (RelationshipAttribute relationship in _resourceGraph.GetResourceType<TResource>().Relationships)
329332
{
330333
// Loads the data of the relationship, if in Entity Framework Core it is configured in such a way that loading
@@ -335,6 +338,7 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
335338
await navigation.LoadAsync(cancellationToken);
336339
}
337340
}
341+
*/
338342

339343
_dbContext.Remove(resourceTracked);
340344

@@ -343,6 +347,114 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
343347
await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceTracked, WriteOperationKind.DeleteResource, cancellationToken);
344348
}
345349

350+
private void EnsureIncomingNavigationsAreTracked(TResource resourceTracked)
351+
{
352+
IEntityType[] entityTypes = _dbContext.Model.GetEntityTypes().ToArray();
353+
IEntityType thisEntityType = entityTypes.Single(entityType => entityType.ClrType == typeof(TResource));
354+
355+
HashSet<INavigation> navigationsToLoad = new();
356+
357+
foreach (INavigation navigation in entityTypes.SelectMany(entityType => entityType.GetNavigations()))
358+
{
359+
bool requiresLoad = navigation.IsOnDependent ? navigation.TargetEntityType == thisEntityType : navigation.DeclaringEntityType == thisEntityType;
360+
361+
if (requiresLoad && navigation.ForeignKey.DeleteBehavior == DeleteBehavior.ClientSetNull)
362+
{
363+
navigationsToLoad.Add(navigation);
364+
}
365+
}
366+
367+
// {Navigation: Customer.FirstOrder (Order) ToPrincipal Order}
368+
// var query = from _dbContext.Set<Customer>().Where(customer => customer.FirstOrder == resourceTracked) // .Select(customer => customer.Id)
369+
370+
// {Navigation: Customer.LastOrder (Order) ToPrincipal Order}
371+
// var query = from _dbContext.Set<Customer>().Where(customer => customer.LastOrder == resourceTracked) // .Select(customer => customer.Id)
372+
373+
// {Navigation: Order.Parent (Order) ToPrincipal Order}
374+
// var query = from _dbContext.Set<Order>().Where(order => order.Parent == resourceTracked) // .Select(order => order.Id)
375+
376+
// {Navigation: ShoppingBasket.CurrentOrder (Order) ToPrincipal Order}
377+
// var query = from _dbContext.Set<ShoppingBasket>().Where(shoppingBasket => shoppingBasket.CurrentOrder == resourceTracked) // .Select(shoppingBasket => shoppingBasket.Id)
378+
379+
var nameFactory = new LambdaParameterNameFactory();
380+
var scopeFactory = new LambdaScopeFactory(nameFactory);
381+
382+
foreach (INavigation navigation in navigationsToLoad)
383+
{
384+
if (!navigation.IsOnDependent && navigation.Inverse != null)
385+
{
386+
// TODO: Handle the case where there is no inverse.
387+
continue;
388+
}
389+
390+
IQueryable source = _dbContext.Set(navigation.DeclaringEntityType.ClrType);
391+
392+
using LambdaScope scope = scopeFactory.CreateScope(source.ElementType);
393+
394+
Expression expression;
395+
396+
if (navigation.IsCollection)
397+
{
398+
/*
399+
{Navigation: WorkItem.Subscribers (ISet<UserAccount>) Collection ToDependent UserAccount}
400+
401+
var subscribers = dbContext.WorkItems
402+
.Where(workItem => workItem == existingWorkItem)
403+
.Include(workItem => workItem.Subscribers)
404+
.Select(workItem => workItem.Subscribers);
405+
*/
406+
407+
Expression left = scope.Accessor;
408+
Expression right = Expression.Constant(resourceTracked, typeof(TResource));
409+
410+
Expression whereBody = Expression.Equal(left, right);
411+
LambdaExpression wherePredicate = Expression.Lambda(whereBody, scope.Parameter);
412+
Expression whereExpression = WhereExtensionMethodCall(source.Expression, scope, wherePredicate);
413+
414+
// TODO: Use typed overload
415+
Expression includeExpression = IncludeExtensionMethodCall(whereExpression, scope, navigation.Name);
416+
417+
MemberExpression selectorBody = Expression.MakeMemberAccess(scope.Accessor, navigation.PropertyInfo);
418+
LambdaExpression selectorLambda = Expression.Lambda(selectorBody, scope.Parameter);
419+
420+
expression = SelectExtensionMethodCall(includeExpression, source.ElementType, navigation.PropertyInfo.PropertyType, selectorLambda);
421+
}
422+
else
423+
{
424+
MemberExpression left = Expression.MakeMemberAccess(scope.Parameter, navigation.PropertyInfo);
425+
ConstantExpression right = Expression.Constant(resourceTracked, typeof(TResource));
426+
427+
Expression body = Expression.Equal(left, right);
428+
LambdaExpression selectorLambda = Expression.Lambda(body, scope.Parameter);
429+
expression = WhereExtensionMethodCall(source.Expression, scope, selectorLambda);
430+
}
431+
432+
IQueryable queryable = source.Provider.CreateQuery(expression);
433+
434+
// Executes the query and loads the returned entities in the change tracker.
435+
// We can likely optimize this by only fetching IDs and creating placeholder resources for them.
436+
object[] results = queryable.Cast<object>().ToArray();
437+
}
438+
}
439+
440+
private Expression WhereExtensionMethodCall(Expression source, LambdaScope lambdaScope, LambdaExpression predicate)
441+
{
442+
return Expression.Call(typeof(Queryable), "Where", lambdaScope.Parameter.Type.AsArray(), source, predicate);
443+
}
444+
445+
private Expression IncludeExtensionMethodCall(Expression source, LambdaScope lambdaScope, string navigationPropertyPath)
446+
{
447+
Expression navigationExpression = Expression.Constant(navigationPropertyPath);
448+
449+
return Expression.Call(typeof(EntityFrameworkQueryableExtensions), "Include", lambdaScope.Parameter.Type.AsArray(), source, navigationExpression);
450+
}
451+
452+
private Expression SelectExtensionMethodCall(Expression source, Type elementType, Type bodyType, Expression selectorBody)
453+
{
454+
Type[] typeArguments = ArrayFactory.Create(elementType, bodyType);
455+
return Expression.Call(typeof(Queryable), "Select", typeArguments, source, selectorBody);
456+
}
457+
346458
private NavigationEntry GetNavigationEntry(TResource resource, RelationshipAttribute relationship)
347459
{
348460
EntityEntry<TResource> entityEntry = _dbContext.Entry(resource);

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/Customer.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Resources;
3+
using JsonApiDotNetCore.Resources.Annotations;
4+
5+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
6+
7+
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Experiments")]
9+
public sealed class Customer : Identifiable<long>
10+
{
11+
[Attr]
12+
public string Name { get; set; } = null!;
13+
14+
[HasOne]
15+
public Order? FirstOrder { get; set; }
16+
17+
[HasOne]
18+
public Order? LastOrder { get; set; }
19+
20+
[HasMany]
21+
public ISet<Order> Orders { get; set; } = new HashSet<Order>();
22+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/ExperimentsDbContext.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using JetBrains.Annotations;
2+
using Microsoft.EntityFrameworkCore;
3+
4+
// @formatter:wrap_chained_method_calls chop_always
5+
6+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
7+
8+
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
public sealed class ExperimentsDbContext : DbContext
10+
{
11+
public DbSet<Customer> Customers => Set<Customer>();
12+
public DbSet<Order> Orders => Set<Order>();
13+
public DbSet<ShoppingBasket> ShoppingBaskets => Set<ShoppingBasket>();
14+
15+
public ExperimentsDbContext(DbContextOptions<ExperimentsDbContext> options)
16+
: base(options)
17+
{
18+
}
19+
20+
protected override void OnModelCreating(ModelBuilder builder)
21+
{
22+
builder.Entity<Customer>()
23+
.HasMany(customer => customer.Orders)
24+
.WithOne(order => order.Customer);
25+
}
26+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/ExperimentsFakers.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using Bogus;
2+
using TestBuildingBlocks;
3+
4+
// @formatter:wrap_chained_method_calls chop_always
5+
// @formatter:keep_existing_linebreaks true
6+
7+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
8+
9+
internal sealed class ExperimentsFakers : FakerContainer
10+
{
11+
private readonly Lazy<Faker<Customer>> _lazyCustomerFaker = new(() =>
12+
new Faker<Customer>()
13+
.UseSeed(GetFakerSeed())
14+
.RuleFor(customer => customer.Name, faker => faker.Person.FullName));
15+
16+
private readonly Lazy<Faker<Order>> _lazyOrderFaker = new(() =>
17+
new Faker<Order>()
18+
.UseSeed(GetFakerSeed())
19+
.RuleFor(order => order.Amount, faker => faker.Finance.Amount()));
20+
21+
private readonly Lazy<Faker<ShoppingBasket>> _lazyShoppingBasketFaker = new(() =>
22+
new Faker<ShoppingBasket>()
23+
.UseSeed(GetFakerSeed())
24+
.RuleFor(shoppingBasket => shoppingBasket.ProductCount, faker => faker.Random.Int(0, 5)));
25+
26+
public Faker<Customer> Customer => _lazyCustomerFaker.Value;
27+
public Faker<Order> Order => _lazyOrderFaker.Value;
28+
public Faker<ShoppingBasket> ShoppingBasket => _lazyShoppingBasketFaker.Value;
29+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/ExperimentsTests.cs‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
using System.Net;
2+
using FluentAssertions;
3+
using FluentAssertions.Common;
4+
using FluentAssertions.Extensions;
5+
using JsonApiDotNetCore.Configuration;
6+
using JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
7+
using Microsoft.AspNetCore.Authentication;
8+
using Microsoft.Extensions.DependencyInjection;
9+
using TestBuildingBlocks;
10+
using Xunit;
11+
12+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
13+
14+
public sealed class ExperimentsTests : IClassFixture<IntegrationTestContext<TestableStartup<ExperimentsDbContext>, ExperimentsDbContext>>
15+
{
16+
private readonly IntegrationTestContext<TestableStartup<ExperimentsDbContext>, ExperimentsDbContext> _testContext;
17+
private readonly ExperimentsFakers _fakers = new();
18+
19+
public ExperimentsTests(IntegrationTestContext<TestableStartup<ExperimentsDbContext>, ExperimentsDbContext> testContext)
20+
{
21+
_testContext = testContext;
22+
23+
testContext.UseController<CustomersController>();
24+
testContext.UseController<OrdersController>();
25+
testContext.UseController<ShoppingBasketsController>();
26+
27+
testContext.ConfigureServicesAfterStartup(services =>
28+
{
29+
services.AddSingleton<ISystemClock>(new FrozenSystemClock
30+
{
31+
UtcNow = 1.January(2005).ToDateTimeOffset()
32+
});
33+
34+
services.AddResourceService<SoftDeletionAwareResourceService<Company, int>>();
35+
services.AddResourceService<SoftDeletionAwareResourceService<Department, int>>();
36+
});
37+
}
38+
39+
[Fact]
40+
public async Task Can_delete_resource()
41+
{
42+
// Arrange
43+
Order existingOrder = _fakers.Order.Generate();
44+
existingOrder.Customer = _fakers.Customer.Generate();
45+
existingOrder.Parent = _fakers.Order.Generate();
46+
existingOrder.Parent.Customer = existingOrder.Customer;
47+
48+
List<ShoppingBasket> existingBaskets = _fakers.ShoppingBasket.Generate(3);
49+
existingBaskets[0].CurrentOrder = existingOrder;
50+
existingBaskets[1].CurrentOrder = existingOrder;
51+
52+
await _testContext.RunOnDatabaseAsync(async dbContext =>
53+
{
54+
dbContext.Orders.Add(existingOrder);
55+
dbContext.ShoppingBaskets.AddRange(existingBaskets);
56+
await dbContext.SaveChangesAsync();
57+
58+
existingOrder.Customer.FirstOrder = existingOrder;
59+
existingOrder.Customer.LastOrder = existingOrder;
60+
await dbContext.SaveChangesAsync();
61+
62+
//var query = dbContext.Set<Customer>().Where(customer => customer.FirstOrder == existingOrder);
63+
//var results = query.ToArray();
64+
});
65+
66+
string route = $"/orders/{existingOrder.StringId}";
67+
68+
// Act
69+
(HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
70+
71+
// Assert
72+
httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
73+
74+
responseDocument.Should().BeEmpty();
75+
}
76+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/Order.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Resources;
3+
using JsonApiDotNetCore.Resources.Annotations;
4+
5+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
6+
7+
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Experiments")]
9+
public sealed class Order : Identifiable<long>
10+
{
11+
[Attr]
12+
public decimal Amount { get; set; }
13+
14+
[HasOne]
15+
public Customer Customer { get; set; } = null!;
16+
17+
[HasOne]
18+
public Order? Parent { get; set; }
19+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Experiments/ShoppingBasket.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Resources;
3+
using JsonApiDotNetCore.Resources.Annotations;
4+
5+
namespace JsonApiDotNetCoreTests.IntegrationTests.Experiments;
6+
7+
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Experiments")]
9+
public sealed class ShoppingBasket : Identifiable<long>
10+
{
11+
[Attr]
12+
public int ProductCount { get; set; }
13+
14+
[HasOne]
15+
public Order? CurrentOrder { get; set; }
16+
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,14 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
159159
await dbContext.SaveChangesAsync();
160160
});
161161

162+
await _testContext.RunOnDatabaseAsync(async dbContext =>
163+
{
164+
IQueryable<ISet<UserAccount>> subscribers = dbContext.WorkItems.Where(workItem => workItem == existingWorkItem)
165+
.Include(workItem => workItem.Subscribers).Select(workItem => workItem.Subscribers);
166+
167+
ISet<UserAccount>[] result = subscribers.ToArray();
168+
});
169+
162170
string route = $"/workItems/{existingWorkItem.StringId}";
163171

164172
// Act

‎test/TestBuildingBlocks/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Default": "Warning",
55
"Microsoft.Hosting.Lifetime": "Warning",
66
"Microsoft.EntityFrameworkCore.Update": "Critical",
7-
"Microsoft.EntityFrameworkCore.Database.Command": "Critical",
7+
"Microsoft.EntityFrameworkCore.Database.Command": "Information",
88
"JsonApiDotNetCore.Middleware.JsonApiMiddleware": "Information"
99
}
1010
}

0 commit comments

Comments
 (0)