Нежадная загрузка мастеров при обновлении объекта

CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 1. `updateViews` parameter of `DefaultDataObjectEdmModelBuilder` class. It allows to change update views for data objects (update view is used for loading a data object during OData update requests).
+2. `masterLightLoadTypes` and `masterLightLoadAllTypes` parameters of `DefaultDataObjectEdmModelBuilder` class. They allow to change loading mode of masters during OData update requests.
 
 ### Changed
 1. Updated Flexberry ORM up to 7.2.0-beta01.

NewPlatform.Flexberry.ORM.ODataService/Model/DataObjectEdmModel.cs

@@ -528,6 +528,13 @@ public View GetDataObjectUpdateView(Type dataObjectType)
  return _metadata[dataObjectType].UpdateView?.Clone();
  }
 
+ /// <summary>
+ /// Возвращает информацию, должны ли мастера объекта загружаться в экономном режиме (только __PrimaryKey).
+ /// </summary>
+ /// <param name="dataObjectType">Тип объекта данных.</param>
+ /// <returns>Мастера должны загружаться экономно.</returns>
+ public bool IsMasterLightLoad(Type dataObjectType) => _metadata == null ? false : _metadata[dataObjectType]?.MasterLightLoad ?? false;
+
  /// <summary>
  /// Получает список зарегистрированных в модели типов по списку имён типов.
  /// </summary>

NewPlatform.Flexberry.ORM.ODataService/Model/DataObjectEdmTypeSettings.cs

@@ -36,6 +36,11 @@ public sealed class DataObjectEdmTypeSettings
  /// </summary>
  public View UpdateView { get; set; }
 
+ /// <summary>
+ /// Whether to load object masters in LightLoaded state (load only primary key).
+ /// </summary>
+ public bool MasterLightLoad { get; set; }
+
  /// <summary>
  /// The list of exposed details.
  /// </summary>
@@ -56,4 +61,4 @@ public sealed class DataObjectEdmTypeSettings
  /// </summary>
  public IDictionary<PropertyInfo, DataObjectEdmDetailSettings> PseudoDetailProperties { get; } = new Dictionary<PropertyInfo, DataObjectEdmDetailSettings>();
  }
-}
+}

NewPlatform.Flexberry.ORM.ODataService/Model/DefaultDataObjectEdmModelBuilder.cs

@@ -74,6 +74,16 @@ public class DefaultDataObjectEdmModelBuilder : IDataObjectEdmModelBuilder
  /// </summary>
  private Dictionary<Type, View> UpdateViews { get; set; }
 
+ /// <summary>
+ /// Types for which masters should be light-loaded on updates (load only __PrimaryKey).
+ /// </summary>
+ private IEnumerable<Type> MasterLightLoadTypes { get; set; }
+
+ /// <summary>
+ /// Whether to load all masters in light-loaded mode on updates (load only __PrimaryKey).
+ /// </summary>
+ private bool MasterLightLoadAllTypes { get; set; }
+
  private readonly PropertyInfo _keyProperty = Information.ExtractPropertyInfo<DataObject>(n => n.__PrimaryKey);
 
  /// <summary>
@@ -88,7 +98,9 @@ public DefaultDataObjectEdmModelBuilder(
  bool useNamespaceInEntitySetName = true,
  PseudoDetailDefinitions pseudoDetailDefinitions = null,
  Dictionary<Type, IEdmPrimitiveType> additionalMapping = null,
- IEnumerable<KeyValuePair<Type, View>> updateViews = null)
+ IEnumerable<KeyValuePair<Type, View>> updateViews = null,
+ IEnumerable<Type> masterLightLoadTypes = null,
+ bool masterLightLoadAllTypes = false)
  {
  _searchAssemblies = searchAssemblies ?? throw new ArgumentNullException(nameof(searchAssemblies), "Contract assertion not met: searchAssemblies != null");
  _useNamespaceInEntitySetName = useNamespaceInEntitySetName;
@@ -105,6 +117,18 @@ public DefaultDataObjectEdmModelBuilder(
  {
  SetUpdateView(updateViews);
  }
+
+ if (masterLightLoadTypes != null)
+ {
+ SetMasterLightLoadTypes(masterLightLoadTypes);
+
+ if (masterLightLoadAllTypes)
+ {
+ throw new ArgumentException("Parameters masterLightLoadAllTypes and masterLightLoadTypes can not be used together in DefaultDataObjectEdmModelBuilder.");
+ }
+ }
+
+ this.MasterLightLoadAllTypes = masterLightLoadAllTypes;
  }
 
  /// <summary>
@@ -215,7 +239,12 @@ private void SetUpdateView(Type dataObjectType, View updateView)
  {
  if (!dataObjectType.IsSubclassOf(typeof(DataObject)))
  {
- throw new ArgumentException("Update view can be set only for a DataObject.", nameof(dataObjectType));
+ throw new ArgumentException($"Update view can be set only for a DataObject. Current type is {dataObjectType}", nameof(dataObjectType));
+ }
+
+ if (dataObjectType is null)
+ {
+ throw new ArgumentException("dataObjectType can not be null.", nameof(dataObjectType));
  }
 
  if (updateView is null)
@@ -232,6 +261,26 @@ private void SetUpdateView(Type dataObjectType, View updateView)
  UpdateViews[dataObjectType] = updateView;
  }
 
+ /// <summary>
+ /// Sets DataObject types for which masters will be light-loaded on updates (load only __PrimaryKey).
+ /// </summary>
+ /// <param name="masterLightLoadTypes">Types for which masters should be light-loaded.</param>
+ private void SetMasterLightLoadTypes(IEnumerable<Type> masterLightLoadTypes)
+ {
+ if (masterLightLoadTypes != null)
+ {
+ foreach (Type type in masterLightLoadTypes)
+ {
+ if (!type.IsSubclassOf(typeof(DataObject)))
+ {
+ throw new ArgumentException("MasterLightLoad option can be set only for a DataObject.", nameof(masterLightLoadTypes));
+ }
+ }
+
+ MasterLightLoadTypes = masterLightLoadTypes;
+ }
+ }
+
  /// <summary>
  /// Adds the property for exposing.
  /// </summary>
@@ -310,6 +359,7 @@ private void AddDataObjectWithHierarchy(DataObjectEdmMetadata meta, Type dataObj
  CollectionName = EntitySetNameBuilder(dataObjectType),
  DefaultView = DynamicView.Create(dataObjectType, null).View,
  UpdateView = updateView,
+ MasterLightLoad = MasterLightLoadAllTypes || (MasterLightLoadTypes?.Contains(dataObjectType) ?? false),
  };
 
  AddProperties(dataObjectType, typeSettings);
@@ -458,4 +508,4 @@ private string BuildEntityPropertyName(PropertyInfo propertyDataObject)
  return propertyDataObject.Name;
  }
  }
-}
+}