Коррекция порядка обработки свойств для объекта с детейлом и мастером одного типа

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 
 ### Fixed
+1. Fixed order of property processing for objects with details and masters of the same type.
 
 ### Security
 

ICSSoft.STORMNET.Business/SQLDataService/SQLDataService.cs

@@ -4171,57 +4171,71 @@ private void GetDependencies(DataObject currentObject, Type currentType, Diction
             ObjectStatus? objectStatus = currentObject?.GetStatus();
 
             // Смотрим мастера и детейлы для выявления зависимостей.
+            // Порядок важен. Сначала мастера, потом детейлы.
+            List<string> details = new List<string>();
+            Dictionary<string, Type> masters = new Dictionary<string, Type>();
             foreach (string prop in props)
             {
                 Type propType = Information.GetPropertyType(currentType, prop);
                 if (propType.IsSubclassOf(typeof(DetailArray)))
                 {
-                    // Обрабатываем детейлы.
-                    Type[] types = Information.GetCompatibleTypesForDetailProperty(currentType, prop);
-                    foreach (Type type in types)
+                    details.Add(prop);
+                }
+                else if (propType.IsSubclassOf(typeof(DataObject)))
+                {
+                    masters.Add(prop, propType);
+                }
+            }
+
+            foreach (string detailCurrent in details)
+            {
+                // Обрабатываем детейлы.
+                Type[] types = Information.GetCompatibleTypesForDetailProperty(currentType, detailCurrent);
+                foreach (Type type in types)
+                {
+                    // Если этот детейл еще не обходили.
+                    if (!dependencies.ContainsKey(type))
                     {
-                        // Если этот детейл еще не обходили.
-                        if (!dependencies.ContainsKey(type))
-                        {
-                            AddDependencies(type, currentType, dependencies);
+                        AddDependencies(type, currentType, dependencies);
 
-                            // Для детейлов доформируем зависимости.
-                            GetDependencies(null, type, dependencies, extraUpdateList);
-                        }
+                        // Для детейлов доформируем зависимости.
+                        GetDependencies(null, type, dependencies, extraUpdateList);
                     }
+                }
 
-                    if (objectStatus == ObjectStatus.Deleted)
+                if (objectStatus == ObjectStatus.Deleted)
+                {
+                    foreach (DataObject detail in (DetailArray)Information.GetPropValueByName(currentObject, detailCurrent))
                     {
-                        foreach (DataObject detail in (DetailArray)Information.GetPropValueByName(currentObject, prop))
+                        if (detail.ContainsAlteredProps())
                         {
-                            if (detail.ContainsAlteredProps())
-                            {
-                                extraUpdateList.Add(detail);
-                            }
+                            extraUpdateList.Add(detail);
                         }
                     }
                 }
-                else if (propType.IsSubclassOf(typeof(DataObject)))
+            }
+
+            foreach (string masterCurrent in masters.Keys)
+            {
+                // Проверяем, есть ли детейловое свойство с таким-же типом.
+                Type propType = masters[masterCurrent];
+                string detailProp = Information.GetDetailArrayPropertyName(currentType, propType);
+                if (detailProp == null || (currentObject != null && Information.GetPropValueByName(currentObject, masterCurrent) != null))
                 {
-                    // Проверяем, есть ли детейловое свойство с таким-же типом.
-                    string detailProp = Information.GetDetailArrayPropertyName(currentType, propType);
-                    if (detailProp == null || (currentObject != null && Information.GetPropValueByName(currentObject, prop) != null))
-                    {
-                        // Обрабатываем мастера.
-                        AddDependencies(currentType, propType, dependencies);
+                    // Обрабатываем мастера.
+                    AddDependencies(currentType, propType, dependencies);
 
-                        // Обрабатываем наследников мастера.
-                        Type[] propertyTypes = TypeUsageProvider.TypeUsage.GetUsageTypes(currentType, prop);
-                        foreach (Type type in propertyTypes)
-                        {
-                            AddDependencies(currentType, type, dependencies);
-                        }
-                    }
-                    else if (objectStatus == ObjectStatus.Deleted && currentObject.ContainsAlteredProps())
+                    // Обрабатываем наследников мастера.
+                    Type[] propertyTypes = TypeUsageProvider.TypeUsage.GetUsageTypes(currentType, masterCurrent);
+                    foreach (Type type in propertyTypes)
                     {
-                        extraUpdateList.Add(currentObject);
+                        AddDependencies(currentType, type, dependencies);
                     }
                 }
+                else if (objectStatus == ObjectStatus.Deleted && currentObject.ContainsAlteredProps())
+                {
+                    extraUpdateList.Add(currentObject);
+                }
             }
         }
 
@@ -4760,7 +4774,7 @@ public virtual void GenerateQueriesForUpdateObjects(
 
             foreach (DataObject processingObject in processingObjects)
             {
-                // Включем текущий объект в граф зависимостей.
+                // Включим текущий объект в граф зависимостей.
                 GetDependencies(processingObject, processingObject.GetType(), dependencies, extraUpdateList);
             }
 

NewPlatform.Flexberry.ORM.MSSQLDataService.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.MSSQLDataService</id>
-    <version>7.1.1</version>
+    <version>7.2.0-beta01</version>
     <title>Flexberry ORM</title>
     <authors>New Platform Ltd</authors>
     <owners>New Platform Ltd</owners>
@@ -13,18 +13,18 @@
     <description>Flexberry ORM package.</description>
     <releaseNotes>
       Fixed
-      1. Error on loading with not stored attribute with inheritance.
+      1. Fixed order of property processing for objects with details and masters of the same type.
       Changed
-      1. Updated NewPlatform.Flexberry.ORM up to 7.1.1.
+      1. Updated NewPlatform.Flexberry.ORM up to 7.2.0-beta01.
     </releaseNotes>
     <copyright>Copyright New Platform Ltd 2023</copyright>
     <tags>Flexberry ORM</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.1" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-beta01" />
       </group>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.1" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-beta01" />
         <dependency id="System.Data.SqlClient" version="4.6.1" />
       </group>
     </dependencies>

NewPlatform.Flexberry.ORM.OracleDataService.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.OracleDataService</id>
-    <version>7.1.1</version>
+    <version>7.2.0-beta01</version>
     <title>Flexberry ORM</title>
     <authors>New Platform Ltd</authors>
     <owners>New Platform Ltd</owners>
@@ -13,19 +13,19 @@
     <description>Flexberry ORM package.</description>
     <releaseNotes>
       Fixed
-      1. Error on loading with not stored attribute with inheritance.
+      1. Fixed order of property processing for objects with details and masters of the same type.
       Changed
-      1. Updated NewPlatform.Flexberry.ORM up to 7.1.1.
+      1. Updated NewPlatform.Flexberry.ORM up to 7.2.0-beta01.
     </releaseNotes>
     <copyright>Copyright New Platform Ltd 2023</copyright>
     <tags>Flexberry ORM</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.1" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-beta01" />
         <dependency id="Oracle.ManagedDataAccess" version="12.1.22" />
       </group>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="NewPlatform.Flexberry.ORM" version="7.1.1" />
+        <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-beta01" />
         <dependency id="Oracle.ManagedDataAccess.Core" version="2.19.3" />
       </group>
     </dependencies>

NewPlatform.Flexberry.ORM.PostgresDataService.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.PostgresDataService</id>
-    <version>7.1.1</version>
+    <version>7.2.0-beta01</version>
     <title>Flexberry ORM</title>
     <authors>New Platform Ltd</authors>
     <owners>New Platform Ltd</owners>
@@ -13,14 +13,14 @@
     <description>Flexberry ORM package.</description>
     <releaseNotes>
       Fixed
-      1. Error on loading with not stored attribute with inheritance.
+      1. Fixed order of property processing for objects with details and masters of the same type.
       Changed
-      1. Updated NewPlatform.Flexberry.ORM up to 7.1.1.
+      1. Updated NewPlatform.Flexberry.ORM up to 7.2.0-beta01.
     </releaseNotes>
     <copyright>Copyright New Platform Ltd 2023</copyright>
     <tags>Flexberry ORM</tags>
     <dependencies>
-      <dependency id="NewPlatform.Flexberry.ORM" version="7.1.1" />
+      <dependency id="NewPlatform.Flexberry.ORM" version="7.2.0-beta01" />
       <dependency id="Npgsql" version="3.2.7" />
     </dependencies>
   </metadata>

NewPlatform.Flexberry.ORM.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM</id>
-    <version>7.1.1</version>
+    <version>7.2.0-beta01</version>
     <title>Flexberry ORM</title>
     <authors>New Platform Ltd</authors>
     <owners>New Platform Ltd</owners>
@@ -13,7 +13,7 @@
     <description>Flexberry ORM package.</description>
     <releaseNotes>
       Fixed
-      1. Error on loading with not stored attribute with inheritance.
+      1. Fixed order of property processing for objects with details and masters of the same type.
     </releaseNotes>
     <copyright>Copyright New Platform Ltd 2023</copyright>
     <tags>Flexberry ORM</tags>