Merge pull request #69 from IliyanAng/master

NikolayIT · web-flow · commit 2ebb3a63d2d8 · 2021-12-03T16:45:15.000+02:00
Add check allowing entity inheritance
diff --git a/src/Data/AspNetCoreTemplate.Data/ApplicationDbContext.cs b/src/Data/AspNetCoreTemplate.Data/ApplicationDbContext.cs
@@ -58,7 +58,7 @@ protected override void OnModelCreating(ModelBuilder builder)
 
             // Set global query filter for not deleted entities only
             var deletableEntityTypes = entityTypes
-                .Where(et => et.ClrType != null && typeof(IDeletableEntity).IsAssignableFrom(et.ClrType));
+                .Where(et => et.ClrType != null && typeof(IDeletableEntity).IsAssignableFrom(et.ClrType) && et.BaseType == null);
             foreach (var deletableEntityType in deletableEntityTypes)
             {
                 var method = SetIsDeletedQueryFilterMethod.MakeGenericMethod(deletableEntityType.ClrType);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected override void OnModelCreating(ModelBuilder builder)`
`58`	`58`
`59`	`59`	`// Set global query filter for not deleted entities only`
`60`	`60`	`var deletableEntityTypes = entityTypes`
`61`		`- .Where(et => et.ClrType != null && typeof(IDeletableEntity).IsAssignableFrom(et.ClrType));`
	`61`	`+ .Where(et => et.ClrType != null && typeof(IDeletableEntity).IsAssignableFrom(et.ClrType) && et.BaseType == null);`
`62`	`62`	`foreach (var deletableEntityType in deletableEntityTypes)`
`63`	`63`	`{`
`64`	`64`	`var method = SetIsDeletedQueryFilterMethod.MakeGenericMethod(deletableEntityType.ClrType);`