Feature/sn 733 use calculated properties inside navigation

README.md

@@ -450,23 +450,6 @@ You can sort multiple properties at once. It can be achieved by pressing sort bu
 
 Sorting can be cancelled by pressing on it with `ALT`.
 
-## Calculated Properties
-Calculated properties are properties that don't have a direct representation in your database but are computed based on other existing properties. These properties can be useful for displaying calculated values in the admin panel.
-
-You can add calculated properties to your entities using the Fluent API:
-
-```csharp
-services.AddNetForge(optionsBuilder =>
-{
-    optionsBuilder.ConfigureEntity<User>(entityOptionsBuilder =>
-    {
-        entityOptionsBuilder.AddCalculatedProperties(user => user.FullName, user => user.Age);
-    });
-
-    // Other settings...
-});
-```
-
 ## Display Properties as Title Case
 
 By default, all entity properties are displayed in Title Case.

demo/Saritasa.NetForge.Demo/Infrastructure/Admin/ShopAdminConfiguration.cs

@@ -65,6 +65,12 @@ public void Configure(EntityOptionsBuilder<Shop> entityOptionsBuilder)
                             .SetIsSortable(true)
                             .SetSearchType(SearchType.ContainsCaseInsensitive);
                     })
+                    .IncludeProperty(address => address.FullAddress, builder =>
+                    {
+                        builder
+                            .SetOrder(5)
+                            .SetDisplayName("Full Address");
+                    })
                     .SetDisplayDetails(true);
             })
             .IncludeNavigation<Product>(shop => shop.Products, navigationOptionsBuilder =>

demo/Saritasa.NetForge.Demo/Infrastructure/Admin/UserAdminConfiguration.cs

@@ -14,7 +14,6 @@ public class UserAdminConfiguration : IEntityAdminConfiguration<User>
     public void Configure(EntityOptionsBuilder<User> entityOptionsBuilder)
     {
         entityOptionsBuilder.SetGroup(GroupConstants.Identity)
-            .AddCalculatedProperties(user => user.FullName, user => user.Age)
             .ConfigureProperty(user => user.FullName, builder => builder.SetOrder(1))
             .ConfigureProperty(user => user.ConcurrencyStamp, builder => builder.SetIsHidden(true))
             .ConfigureProperty(user => user.LockoutEnd, builder => builder.SetIsHidden(true))

demo/Saritasa.NetForge.Demo/Models/Address.cs

@@ -52,6 +52,11 @@ public class Address
     [Required]
     public required string Country { get; set; }
 
+    /// <summary>
+    /// Full address.
+    /// </summary>
+    public string FullAddress => $"{Country}, {Street}, {City}";
+
     /// <summary>
     /// The latitude coordinate of the address location.
     /// </summary>

src/Saritasa.NetForge.Domain/Entities/Options/EntityOptions.cs

@@ -50,11 +50,6 @@ public EntityOptions(Type entityType)
     /// </summary>
     public ICollection<PropertyOptions> PropertyOptions { get; set; } = new List<PropertyOptions>();
 
-    /// <summary>
-    /// Collection of the calculated property names.
-    /// </summary>
-    public List<string> CalculatedPropertyNames { get; } = new();
-
     /// <inheritdoc cref="EntityMetadata.SearchFunction"/>
     public Func<IServiceProvider?, IQueryable<object>, string, IQueryable<object>>? SearchFunction { get; set; }
 

src/Saritasa.NetForge.DomainServices/EntityOptionsBuilder.cs

@@ -114,18 +114,6 @@ public EntityOptionsBuilder<TEntity> ConfigureProperty(
         return this;
     }
 
-    /// <summary>
-    /// Adds calculated properties for the specified entity type.
-    /// </summary>
-    /// <param name="propertyExpressions">An array of lambda expressions representing calculated properties.</param>
-    public EntityOptionsBuilder<TEntity> AddCalculatedProperties(
-        params Expression<Func<TEntity, object?>>[] propertyExpressions)
-    {
-        var propertyNames = propertyExpressions.Select(expression => expression.GetMemberName());
-        options.CalculatedPropertyNames.AddRange(propertyNames);
-        return this;
-    }
-
     /// <summary>
     /// Adds navigation property to the entity.
     /// </summary>

src/Saritasa.NetForge.Infrastructure.EfCore/Services/EfCoreMetadataService.cs

@@ -61,45 +61,20 @@ private static EntityMetadata GetEntityMetadata(IReadOnlyEntityType entityType)
             .Concat<IReadOnlyNavigationBase>(entityType.GetSkipNavigations())
             .Select(GetNavigationMetadata);
 
-        var propertiesMetadata = entityType.GetProperties().Select(GetPropertyMetadata);
         var entityMetadata = new EntityMetadata
         {
             DisplayName = entityType.ShortName(),
             ClrType = entityType.ClrType,
             Description = entityType.GetComment() ?? string.Empty,
             IsHidden = entityType.IsPropertyBag,
-            Properties = propertiesMetadata.ToList(),
+            Properties = GetPropertiesMetadata(entityType),
             Navigations = navigationsMetadata.ToList(),
             IsKeyless = entityType.FindPrimaryKey() is null
         };
 
         return entityMetadata;
     }
 
-    /// <summary>
-    /// Retrieve metadata for a property of an entity type.
-    /// </summary>
-    /// <param name="property">The EF Core property to retrieve metadata for.</param>
-    /// <returns>A <see cref="PropertyMetadata"/> object containing metadata information for the property.</returns>
-    private static PropertyMetadata GetPropertyMetadata(IReadOnlyProperty property)
-    {
-        var propertyMetadata = new PropertyMetadata
-        {
-            Name = property.Name,
-            Description = property.GetComment() ?? string.Empty,
-            ClrType = property.ClrType,
-            PropertyInformation = property.PropertyInfo,
-            IsForeignKey = property.IsForeignKey(),
-            IsPrimaryKey = property.IsPrimaryKey(),
-            IsNullable = property.IsNullable,
-            Order = property.GetColumnOrder(),
-            IsShadow = property.IsShadowProperty(),
-            IsValueGeneratedOnAdd = property.ValueGenerated.HasFlag(ValueGenerated.OnAdd),
-            IsValueGeneratedOnUpdate = property.ValueGenerated.HasFlag(ValueGenerated.OnUpdate),
-        };
-        return propertyMetadata;
-    }
-
     /// <summary>
     /// Retrieve metadata for a navigation of an entity type.
     /// </summary>
@@ -121,12 +96,56 @@ private static NavigationMetadata GetNavigationMetadata(IReadOnlyNavigationBase
         {
             Name = navigation.Name,
             IsCollection = navigation.IsCollection,
-            TargetEntityProperties = navigation.TargetEntityType.GetProperties().Select(GetPropertyMetadata).ToList(),
+            TargetEntityProperties = GetPropertiesMetadata(navigation.TargetEntityType),
             PropertyInformation = navigation.PropertyInfo,
             ClrType = navigation.ClrType,
             IsNullable = isNullable
         };
 
         return navigationMetadata;
     }
+
+    private static List<PropertyMetadata> GetPropertiesMetadata(IReadOnlyEntityType entityType)
+    {
+        var propertiesMetadata = entityType.GetProperties().Select(GetPropertyMetadata);
+
+        var reflectionProperties = entityType.ClrType
+            .GetProperties()
+            .Where(property => !propertiesMetadata.Any(metadata => metadata.Name == property.Name));
+
+        var calculatedProperties = reflectionProperties
+            .Where(property => property is { CanRead: true, CanWrite: false })
+            .Select(propertyInfo => new PropertyMetadata
+            {
+                Name = propertyInfo.Name,
+                IsEditable = false,
+                PropertyInformation = propertyInfo,
+                IsCalculatedProperty = true
+            });
+        return propertiesMetadata.Union(calculatedProperties).ToList();
+    }
+
+    /// <summary>
+    /// Retrieve metadata for a property of an entity type.
+    /// </summary>
+    /// <param name="property">The EF Core property to retrieve metadata for.</param>
+    /// <returns>A <see cref="PropertyMetadata"/> object containing metadata information for the property.</returns>
+    private static PropertyMetadata GetPropertyMetadata(IReadOnlyProperty property)
+    {
+        var propertyMetadata = new PropertyMetadata
+        {
+            Name = property.Name,
+            Description = property.GetComment() ?? string.Empty,
+            ClrType = property.ClrType,
+            PropertyInformation = property.PropertyInfo,
+            IsForeignKey = property.IsForeignKey(),
+            IsPrimaryKey = property.IsPrimaryKey(),
+            IsNullable = property.IsNullable,
+            Order = property.GetColumnOrder(),
+            IsShadow = property.IsShadowProperty(),
+            IsValueGeneratedOnAdd = property.ValueGenerated.HasFlag(ValueGenerated.OnAdd),
+            IsValueGeneratedOnUpdate = property.ValueGenerated.HasFlag(ValueGenerated.OnUpdate),
+        };
+        return propertyMetadata;
+    }
 }

src/Saritasa.NetForge.Tests/MetadataTests/UserAdminConfiguration.cs

@@ -14,7 +14,6 @@ public void Configure(EntityOptionsBuilder<User> entityOptionsBuilder)
     {
         entityOptionsBuilder.SetGroup("Identity")
             .SetDescription("This is a description")
-            .AddCalculatedProperties(user => user.FullName, user => user.Age)
             .ConfigureProperty(user => user.FullName, builder => builder.SetOrder(1))
             .ConfigureProperty(user => user.ConcurrencyStamp, builder => builder.SetIsHidden(true))
             .ConfigureProperty(user => user.LockoutEnd, builder => builder.SetIsHidden(true))

src/Saritasa.NetForge.UseCases/Metadata/Services/AdminMetadataService.cs

@@ -52,8 +52,6 @@ public IEnumerable<EntityMetadata> GetMetadata()
 
             if (entityOptions != null)
             {
-                var calculatedProperties = GetCalculatedPropertiesMetadata(entityOptions);
-                entityMetadata.Properties.AddRange(calculatedProperties);
                 entityMetadata.ApplyOptions(entityOptions, adminOptions);
             }
 
@@ -65,38 +63,6 @@ public IEnumerable<EntityMetadata> GetMetadata()
         return metadata;
     }
 
-    /// <summary>
-    /// Retrieves metadata for calculated properties defined in the entity options.
-    /// </summary>
-    /// <param name="entityOptions">The entity options that specify the calculated properties.</param>
-    /// <returns>An enumerable collection of calculated property metadata.</returns>
-    private static IEnumerable<PropertyMetadata> GetCalculatedPropertiesMetadata(EntityOptions entityOptions)
-    {
-        var propertiesMetadata = new List<PropertyMetadata>();
-
-        foreach (var propertyName in entityOptions.CalculatedPropertyNames)
-        {
-            var propertyInformation = entityOptions.EntityType.GetProperty(propertyName);
-
-            if (propertyInformation == null)
-            {
-                continue;
-            }
-
-            var propertyMetadata = new PropertyMetadata
-            {
-                Name = propertyName,
-                IsEditable = false,
-                PropertyInformation = propertyInformation,
-                IsCalculatedProperty = true
-            };
-
-            propertiesMetadata.Add(propertyMetadata);
-        }
-
-        return propertiesMetadata;
-    }
-
     /// <summary>
     /// Try to get the entities metadata from the cache.
     /// </summary>