Exclude proxies collection SN-776

saritasa-nest · Feb 6, 2025 · 4201c14 · 4201c14
1 parent 67a2a04
commit 4201c14
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/src/Saritasa.NetForge/Domain/Extensions/CloneExtensions.cs b/src/Saritasa.NetForge/Domain/Extensions/CloneExtensions.cs
@@ -33,7 +33,13 @@ public static class CloneExtensions
 
         var serializeSettings = new JsonSerializerSettings
         {
-            ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+
+            // Ignore errors during serialization (in case of shadow properties in LazyLoadingProxies).
+            Error = (serializer, err) =>
+            {
+                err.ErrorContext.Handled = true;
+            }
         };
 
         serializeSettings.Converters.Add(new DecimalJsonConverter());

diff --git a/src/Saritasa.NetForge/Infrastructure/EfCore/Services/EfCoreDataService.cs b/src/Saritasa.NetForge/Infrastructure/EfCore/Services/EfCoreDataService.cs
@@ -240,7 +240,14 @@ public async Task<object> UpdateAsync(
     private async Task UpdateAsync(
         DbContext dbContext, object entity, object originalEntity, CancellationToken cancellationToken)
     {
-        dbContext.Attach(originalEntity);
+        try
+        {
+            dbContext.Attach(originalEntity);
+        }
+        catch (InvalidOperationException)
+        {
+            // Do nothing. It means that entity is already tracked.
+        }
 
         await UpdateNavigations(dbContext, entity, originalEntity);
 
@@ -295,13 +302,15 @@ private static void UpdateNavigationReference(
         }
         else
         {
-            var isTracked = dbContext.IsTracked(navigationEntry.CurrentValue!, comparer);
-
-            if (!isTracked)
+            try
             {
                 dbContext.Attach(navigationEntry.CurrentValue!);
-                originalNavigationEntry.CurrentValue = navigationEntry.CurrentValue;
             }
+            catch (InvalidOperationException)
+            {
+                // Do nothing. It means that entity is already tracked.
+            }
+            originalNavigationEntry.CurrentValue = navigationEntry.CurrentValue;
         }
     }
 
@@ -316,12 +325,14 @@ private static void UpdateNavigationCollection(
         // Track added elements
         foreach (var element in navigationCollectionInstance)
         {
-            var isTracked = dbContext.IsTracked(element, comparer);
-
-            if (!isTracked)
+            try
             {
                 dbContext.Attach(element);
             }
+            catch (InvalidOperationException)
+            {
+                // Do nothing. It means that entity is already tracked.
+            }
         }
 
         var originalNavigationCollectionInstance = (IEnumerable<object>)originalNavigationEntry.CurrentValue!;

diff --git a/src/Saritasa.NetForge/Infrastructure/EfCore/Services/ProxyToPocoConverter.cs b/src/Saritasa.NetForge/Infrastructure/EfCore/Services/ProxyToPocoConverter.cs
@@ -48,7 +48,7 @@ public static class ProxyToPocoConverter
         foreach (var property in entityType.GetProperties())
         {
             // Exclude the navigation properties because they are the proxies as well.
-            if (navigationPropertyNames != null && !navigationPropertyNames.Contains(property.Name))
+            if (navigationPropertyNames != null && navigationPropertyNames.Contains(property.Name))
             {
                 continue;
             }
@@ -63,17 +63,27 @@ public static class ProxyToPocoConverter
             {
                 var value = property.GetValue(source);
 
+                // Skip the property if it is a proxy.
                 if (value != null && value.GetType().IsLazyLoadingProxy())
                 {
                     continue;
                 }
 
+                // Check if the property is a collection of proxy entities.
+                if (value is IEnumerable<object> collection)
+                {
+                    var firstItem = collection.FirstOrDefault();
+                    if (firstItem != null && firstItem.GetType().IsLazyLoadingProxy())
+                    {
+                        continue;
+                    }
+                }
+
                 property.SetValue(pocoInstance, value);
             }
             catch
             {
                 // Skip the property if it cannot be copied.
-                property.SetValue(pocoInstance, null);
             }
         }