tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor navigation entry update logic in change tracker

pull/23329/head
maliming 7 months ago
parent
acec1159c5
commit
2f452931ec
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
2 changed files with 30 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
  2. 51
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEntityEntry.cs

18
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
View File

@ -75,9 +75,12 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
continue;
}
if (checkEntityEntryState && entityEntry.State == EntityState.Unchanged)
var navigationEntry = abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is INavigation navigationMetadata && navigationMetadata.ForeignKey == foreignKey) ??
abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is ISkipNavigation skipNavigationMetadata && skipNavigationMetadata.ForeignKey == foreignKey);
if (navigationEntry != null && checkEntityEntryState && entityEntry.State == EntityState.Unchanged)
{
abpEntityEntry.UpdateNavigationEntries(entityEntry, foreignKey);
abpEntityEntry.UpdateNavigation(entityEntry, navigationEntry);
}
if (!abpEntityEntry.IsModified && (!checkEntityEntryState || IsEntityEntryChanged(entityEntry)))
@ -86,8 +89,6 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
DetectChanges(abpEntityEntry.EntityEntry, false);
}
var navigationEntry = abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is INavigation navigationMetadata && navigationMetadata.ForeignKey == foreignKey) ??
abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is ISkipNavigation skipNavigationMetadata && skipNavigationMetadata.ForeignKey == foreignKey);
if (navigationEntry != null && IsEntityEntryChanged(entityEntry))
{
navigationEntry.IsModified = true;
@ -119,9 +120,12 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
continue;
}
if (checkEntityEntryState && entityEntry.State == EntityState.Unchanged)
var navigationEntry = abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is INavigation navigationMetadata && navigationMetadata.ForeignKey == inverseForeignKey) ??
abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is ISkipNavigation skipNavigationMetadata && skipNavigationMetadata.ForeignKey == inverseForeignKey);
if (navigationEntry != null && checkEntityEntryState && entityEntry.State == EntityState.Unchanged)
{
abpEntityEntry.UpdateNavigationEntries(entityEntry, inverseForeignKey);
abpEntityEntry.UpdateNavigation(entityEntry, navigationEntry);
}
if (!abpEntityEntry.IsModified && (!checkEntityEntryState || IsEntityEntryChanged(entityEntry)))
@ -130,8 +134,6 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
DetectChanges(abpEntityEntry.EntityEntry, false);
}
var navigationEntry = abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is INavigation navigationMetadata && navigationMetadata.ForeignKey == inverseForeignKey) ??
abpEntityEntry.NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is ISkipNavigation skipNavigationMetadata && skipNavigationMetadata.ForeignKey == inverseForeignKey);
if (navigationEntry != null && (!checkEntityEntryState || IsEntityEntryChanged(entityEntry)))
{
navigationEntry.IsModified = true;

51
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEntityEntry.cs
View File

@ -1,10 +1,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using Microsoft.EntityFrameworkCore.Metadata;
namespace Volo.Abp.EntityFrameworkCore.ChangeTrackers;
@ -33,39 +31,30 @@ public class AbpEntityEntry
NavigationEntries = EntityEntry.Navigations.Select(x => new AbpNavigationEntry(x, x.Metadata.Name)).ToList();
}
public void UpdateNavigationEntries(EntityEntry entityEntry, IForeignKey foreignKey)
public void UpdateNavigation(EntityEntry entityEntry, AbpNavigationEntry navigationEntry)
{
var entityEntryNavigationEntry = NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is INavigation navigationMetadata && navigationMetadata.ForeignKey == foreignKey) ??
NavigationEntries.FirstOrDefault(x => x.NavigationEntry.Metadata is ISkipNavigation skipNavigationMetadata && skipNavigationMetadata.ForeignKey == foreignKey);
foreach (var navigationEntry in NavigationEntries)
if (IsModified ||
EntityEntry.State == EntityState.Modified ||
navigationEntry.IsModified)
{
if (IsModified ||
EntityEntry.State == EntityState.Modified ||
navigationEntry.IsModified)
{
continue;
}
return;
}
var currentValue = navigationEntry.NavigationEntry.CurrentValue;
if (currentValue == null)
{
continue;
}
var currentValue = navigationEntry.NavigationEntry.CurrentValue;
if (currentValue == null)
{
return;
}
if (navigationEntry.NavigationEntry is CollectionEntry)
{
if (navigationEntry != entityEntryNavigationEntry)
{
continue;
}
navigationEntry.OriginalValue ??= new List<object>();
var ls = navigationEntry.OriginalValue.As<List<object>>();
ls.AddIfNotContains(entityEntry.Entity);
}
else
{
navigationEntry.OriginalValue = currentValue;
}
if (navigationEntry.NavigationEntry is CollectionEntry)
{
navigationEntry.OriginalValue ??= new List<object>();
var ls = navigationEntry.OriginalValue.As<List<object>>();
ls.AddIfNotContains(entityEntry.Entity);
}
else
{
navigationEntry.OriginalValue = currentValue;
}
}
}

Write Preview
Loading…
Cancel
Save