Lots of refactoring and reordering

Author: Felix-CodingClimber

samples/DotNetElements.Samples.AppFramework.WebApi/Modules/Categories/Entities/Category.cs

@@ -1,4 +1,5 @@
-using DotNetElements.Samples.AppFramework.WebApi.Modules.ToDoItems;
+using DotNetElements.AppFramework.Abstractions.Entity;
+using DotNetElements.Samples.AppFramework.WebApi.Modules.ToDoItems;
 
 namespace DotNetElements.Samples.AppFramework.WebApi.Modules.Categories;
 

samples/DotNetElements.Samples.AppFramework.WebApi/Modules/ToDoItems/Entities/ToDoItem.cs

@@ -1,4 +1,5 @@
-using DotNetElements.Samples.AppFramework.WebApi.Modules.Categories;
+using DotNetElements.AppFramework.Abstractions.Entity;
+using DotNetElements.Samples.AppFramework.WebApi.Modules.Categories;
 
 namespace DotNetElements.Samples.AppFramework.WebApi.Modules.ToDoItems;
 

src/DotNetElements.AppFramework/Entity/EntityBase.cs renamed to src/DotNetElements.AppFramework.Abstractions/Entity/EntityBase.cs

@@ -1,4 +1,6 @@
-namespace DotNetElements.AppFramework;
+using DotNetElements.AppFramework.Abstractions.Entity;
+
+namespace DotNetElements.AppFramework;
 
 public abstract class Entity { }
 

src/DotNetElements.AppFramework/Entity/EntityContracts.cs renamed to src/DotNetElements.AppFramework.Abstractions/Entity/EntityContracts.cs

@@ -1,4 +1,4 @@
-namespace DotNetElements.AppFramework;
+namespace DotNetElements.AppFramework.Abstractions.Entity;
 
 public interface IEntity<TKey> : IHasKey<TKey>
     where TKey : notnull, IEquatable<TKey>;
@@ -57,3 +57,22 @@ public interface IUpdateFromEx<TFrom> : IUpdateFrom
 {
     void Update(TFrom from, IEntityUpdateHelper entityUpdateHelper);
 }
+
+public interface IEntityUpdateHelper
+{
+    TRelatedEntity AttachById<TRelatedEntity, TKey>(TKey id, bool checkAlreadyTracked = false)
+        where TRelatedEntity : Entity<TKey>
+        where TKey : notnull, IEquatable<TKey>;
+
+    Guid GetCurrentUserId();
+
+    DateTimeOffset GetUtcNow();
+
+    void UpdateRelatedEntities<TEntity, TKey>(List<TEntity> oldCollection, IEnumerable<TKey> newIdsCollection)
+        where TEntity : Entity<TKey>
+        where TKey : notnull, IEquatable<TKey>
+    {
+        EntityHelper.UpdateRelatedEntities<TEntity, TKey>(oldCollection, newIdsCollection, this);
+    }
+}
+

src/DotNetElements.AppFramework/Entity/EntityHelper.cs renamed to src/DotNetElements.AppFramework.Abstractions/Entity/EntityHelper.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace DotNetElements.AppFramework;
+namespace DotNetElements.AppFramework.Abstractions.Entity;
 
 public static class EntityHelper
 {

src/DotNetElements.AppFramework.AspNet/ResultExtensions/CrudResultExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Http;
 
 using IHttpResult = Microsoft.AspNetCore.Http.IResult;
 
@@ -22,6 +23,14 @@ public static IHttpResult MapToHttpResult<TEntity>(this CrudResult<TEntity> crud
         return MapToFailedHttpResult(error.Value);
     }
 
+    public static IHttpResult MapToHttpResultWithProjection<TEntity, TResult>(this CrudResult<TEntity> crudResult, Expression<Func<TEntity, TResult>> projection)
+    {
+        if (crudResult.TryGetValue(out TEntity? value, out CrudError? error))
+            return Results.Ok(projection.Compile().Invoke(value));
+
+        return MapToFailedHttpResult(error.Value);
+    }
+
     private static IHttpResult MapToFailedHttpResult(CrudError errorCode)
     {
         return Results.Problem(title: $"{typeof(CrudError).Name}.{errorCode}", detail: ((int)errorCode).ToString(), type: typeof(CrudError).Name);

src/DotNetElements.AppFramework.AspNet/WebApplicationBuilderExtensions.cs

@@ -17,7 +17,19 @@ public static WebApplicationBuilder AddAppFramework(this WebApplicationBuilder b
         builder.Services.AddScoped<ICurrentUserProvider, CurrentUserProvider>();
         builder.Services.AddSerilog((services, options) =>
         {
-            options.ReadFrom.Configuration(builder.Configuration);
+            options.ReadFrom.Configuration(builder.Configuration)
+                   .Filter.ByExcluding(logEvent => // todo only in development, make configurable
+                    {
+                        if (logEvent.Properties.TryGetValue("RequestPath", out var value))
+                        {
+                            string valueString = value.ToString();
+
+                            return valueString.StartsWith("\"/_framework")
+                                || valueString.StartsWith("\"/_content");
+                        }
+
+                        return false;
+                    });
         });
 
         builder.RegisterModules(moduleAssembly);

src/DotNetElements.AppFramework.Development/FakeCurrentUserProvider.cs

@@ -2,7 +2,7 @@
 
 namespace DotNetElements.AppFramework.Development;
 
-public class FakeCurrentUserProvider : ICurrentUserProvider
+public sealed class FakeCurrentUserProvider : ICurrentUserProvider
 {
     private readonly Guid fakeUserId;
 

src/DotNetElements.AppFramework.Example/Program.cs

@@ -1,5 +1,6 @@
 using DotNetElements.AppFramework;
 using DotNetElements.AppFramework.Abstractions.Auth;
+using DotNetElements.AppFramework.Abstractions.Entity;
 using DotNetElements.AppFramework.Abstractions.Model;
 using DotNetElements.AppFramework.DebugEfCore;
 using Microsoft.Extensions.Logging;

src/DotNetElements.AppFramework.Example/TestUtils/TestAuditInterceptor.cs

@@ -1,4 +1,5 @@
 using DotNetElements.AppFramework.Abstractions.Auth;
+using DotNetElements.AppFramework.Abstractions.Entity;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;