Dev

src/Directory.Build.props

@@ -18,9 +18,9 @@
 	  <LangVersion>latest</LangVersion>
 
 	  <RepositoryUrl>https://github.com/arsalanfallahpour/DotNetCenter.Beyond.git</RepositoryUrl>
-	  <ClasslibraryVersion>0.1.15</ClasslibraryVersion>
-	  <FileVersion>0.1.15</FileVersion>
-	  <AssemblyVersion>0.1.15</AssemblyVersion>
+	  <ClasslibraryVersion>0.2.12</ClasslibraryVersion>
+	  <FileVersion>0.2.12</FileVersion>
+	  <AssemblyVersion>0.2.12</AssemblyVersion>
 
 	  <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>3.3.2</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
 	  <MicrosoftNetCompilersToolsetPackageVersion>3.9.0-2.final</MicrosoftNetCompilersToolsetPackageVersion>
@@ -79,7 +79,7 @@
 	  <DotNetCenterCorePrimaryPackageVersion>0.2.1</DotNetCenterCorePrimaryPackageVersion>
 
 
-	  <DotNetCenterCoreEntitiesPrimaryPackageVersion>0.2.2</DotNetCenterCoreEntitiesPrimaryPackageVersion>
+	  <DotNetCenterCoreEntitiesPrimaryPackageVersion>0.2.7</DotNetCenterCoreEntitiesPrimaryPackageVersion>
 	  <DotNetCenterCoreExceptionHandlersPrimaryPackageVersion>0.2.2</DotNetCenterCoreExceptionHandlersPrimaryPackageVersion>
 
 	  <AutoMapperExtMicDepInjPrimaryPackageVersion>8.1.1</AutoMapperExtMicDepInjPrimaryPackageVersion>

src/Mediation/Behaviours/Source/DotNetCenter.Beyond.Mediation.Behaviours.csproj

@@ -72,8 +72,11 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\Validation\ExceptionHandlers\Source\DotNetCenter.Beyond.Validation.ExceptionHandlers.csproj" />
 		<ProjectReference Include="..\..\..\ObjRelMapping\Core\Source\DotNetCenter.Beyond.ObjRelMapping.Core.csproj" />
+		<ProjectReference Include="..\..\..\Web\Identity\Services\Source\DotNetCenter.Beyond.Web.Identity.Services.csproj" />
 		<ProjectReference Include="..\..\..\Web\Identity\ObjRelMapping\Source\DotNetCenter.Beyond.Web.Identity.ObjRelMapping.csproj" />
 		<ProjectReference Include="..\..\..\Web\Identity\Core\Source\DotNetCenter.Beyond.Web.Identity.Core.csproj" />
+
+
 	</ItemGroup>
 
 

src/Mediation/Behaviours/Source/RequestLogger.cs

@@ -8,26 +8,35 @@ namespace DotNetCenter.Beyond.Mediation.Behaviours
     using DotNetCenter.Beyond.Web.Identity.Core;
     using System;
     using DotNetCenter.Beyond.Web.Identity.ObjRelMapping.DbContextServices;
+    using DotNetCenter.Beyond.Web.Identity.Services;
+    using DotNetCenter.Beyond.Web.Identity.Services.Managers;
+    using DotNetCenter.Beyond.Web.Identity.ObjRelMapping.Common.Models;
 
     public class RequestLogger<TRequest> : IRequestPreProcessor<TRequest>
     {
         private readonly ILogger _logger;
         private readonly CurrentUserService _currentUserService;
-        private readonly IdentityService _identityService;
+        private readonly IdentityService<IIdentityUser> _identityService;
 
         public RequestLogger(
             ILogger<TRequest> logger,
             CurrentUserService currentUserService,
-            IdentityService identityService)
+            IdentityService<IIdentityUser> identityService)
         {
             _logger = logger;
             _currentUserService = currentUserService;
             _identityService = identityService;
         }
         public async Task Process(TRequest request, CancellationToken cancellationToken)
         {
-            var userName = await _identityService.GetUsernameAsync(_currentUserService.UserId);
-            _logger.LogInformation("Request: {Name} {@UserId} {@UserName} {@Request}", typeof(TRequest).Name, _currentUserService.UserId, userName, request);
+            int? userId = -9845;
+            var userName = "Not Authorized User";
+            if (_currentUserService.IsUserAuthenticated())
+            {
+                userId = _currentUserService.UserId;
+                userName = await _identityService.GetUsernameAsync((int)_currentUserService.UserId);
+            }
+            _logger.LogInformation("Request: {Name} {@UserId} {@UserName} {@Request}", typeof(TRequest).Name, userId, userName, request);
         }
     }
 }

src/Mediation/Behaviours/Source/RequestPerformanceBehaviour.cs

@@ -8,18 +8,23 @@
     using MediatR;
     using System;
     using DotNetCenter.Beyond.Web.Identity.ObjRelMapping.DbContextServices;
+    using DotNetCenter.Beyond.Web.Identity.Services.Managers;
+    using System.Security.Principal;
+    using DotNetCenter.Beyond.Web.Identity.ObjRelMapping.Common.Models;
+    using DotNetCenter.Beyond.Web.Identity.Services;
+
     public class RequestPerfObjRelMappinganceBehaviour<TRequest, TResponse> 
         : IPipelineBehavior<TRequest, TResponse>
     {
         private readonly Stopwatch _timer;
         private readonly ILogger<TRequest> _logger;
         private readonly CurrentUserService _currentUserService;
-        private readonly IdentityService _identityService;
+        private readonly IdentityService<IIdentityUser> _identityService;
 
         public RequestPerfObjRelMappinganceBehaviour(
             ILogger<TRequest> logger,
             CurrentUserService currentUserService,
-            IdentityService identityService)
+            IdentityService<IIdentityUser> identityService)
         {
             _timer = new Stopwatch();
             _logger = logger;
@@ -49,17 +54,17 @@ private async Task LogRequestLongRunning(TRequest request)
         {
             var logMessage = "Application Long Running Request: {Name} ({ElapsedMilliseconds} milliseconds) {@UserId}";
             var requestName = typeof(TRequest).Name;
-            if (_currentUserService.TrySetUserId())
+            //if (_currentUserService.TrySetUserId())
                 await LogCriticalWithUserName(request, _timer.ElapsedMilliseconds, logMessage, requestName);
-            else
-                _logger.LogCritical(logMessage + "{@Request}", requestName, _timer.ElapsedMilliseconds, request);
+            //else
+            //    _logger.LogCritical(logMessage + "{@Request}", requestName, _timer.ElapsedMilliseconds, request);
         }
 
         private async Task LogCriticalWithUserName(TRequest request, long elapsedMilliseconds, string logMessage, string requestName)
         {
             var userId = _currentUserService.UserId;
-            if (_currentUserService.TrySetUsername())
-                _logger.LogCritical(logMessage + "{@UserName} {@Request}", requestName, elapsedMilliseconds, userId, _currentUserService.Username, request);
+             var username = _currentUserService?.Username ?? "UnAuthorized User %!%";
+            _logger.LogCritical(logMessage + "{@UserName} {@Request}", requestName, elapsedMilliseconds, userId, username, request);
         }
     }
 }

src/ObjRelMapping/Core/Source/Auditing/AuditableDbService.cs

@@ -4,10 +4,11 @@ namespace DotNetCenter.Beyond.ObjRelMapping.Core.DbContext
     using System;
     using System.Threading;
     using System.Threading.Tasks;
-    public interface AuditableDbService<TContext> 
+    public interface AuditableDbService
 	: IDisposable, IAsyncDisposable, AuditableDbContext, EntryableDbContext, SetableDbContext
     {   
         void Save();
+        Task<int> SaveAsync();
         Task<int> SaveAsync(CancellationToken cancellationToken = default);
     }
 }

src/ObjRelMapping/Core/Source/Auditing/BaseAuditableDbContext.cs

@@ -7,7 +7,7 @@
     using System.Threading.Tasks;
     public abstract class BaseAuditableDbContext<TContext> 
 	: DbContext
-	, AuditableDbService<TContext> 
+	, AuditableDbService
 	where TContext : DbContext
     {
         private readonly string _defaultSchema;
@@ -24,15 +24,16 @@ protected override void OnModelCreating(ModelBuilder builder)
         {
             if (!string.IsNullOrEmpty(_defaultSchema) && !string.IsNullOrWhiteSpace(_defaultSchema))
                 builder.HasDefaultSchema(_defaultSchema);
+            else
+                builder.HasDefaultSchema("dbo");
 
             //builder.ApplyConfigurationsFromAssembly(typeof(DatabaseService<>).Assembly);
 
             base.OnModelCreating(builder);
         }
-        public void Audit()
-            => _auditor.UpdateModifiedAll(ChangeTracker);
+        public virtual void Audit() => _auditor.UpdateModifiedAll(ChangeTracker);
         public abstract void Save();
-
+        public abstract Task<int> SaveAsync();
         public abstract Task<int> SaveAsync(CancellationToken cancellationToken = default);
     }
 }

src/ObjRelMapping/Core/Source/DbContext/BaseDbContext.cs

@@ -2,28 +2,43 @@
 {
     using DotNetCenter.Beyond.ObjRelMapping.Core.DbContext;
     using Microsoft.EntityFrameworkCore;
+    using System.Reflection;
     using System.Threading;
     using System.Threading.Tasks;
-    public abstract class BaseDbContext<TContext> : DbContext, DbService<TContext> 
+    public abstract class BaseDbContext<TContext> : DbContext, DbService
 	where TContext 
 	: DbContext
     {
-        private readonly string _defaultSchema;
-
+        public virtual string Schema => _defaultSchema;
+        public readonly string _defaultSchema;
+        public abstract Assembly ConfigurationAssemby { get; }
+        public abstract bool UseAssemblyToScanConfigurations { get; }
+        public abstract bool EnableSensitiveDataLogging { get; }
         public BaseDbContext(DbContextOptions<TContext> options, string defaultSchema = "dbo") 
 	  : base(options)
           =>  _defaultSchema = defaultSchema;
-
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            base.OnConfiguring(optionsBuilder);
+            optionsBuilder.EnableSensitiveDataLogging(UseAssemblyToScanConfigurations);
+        }
         protected override void OnModelCreating(ModelBuilder builder)
         {
+            base.OnModelCreating(builder);
+
             if (!string.IsNullOrEmpty(_defaultSchema) && !string.IsNullOrWhiteSpace(_defaultSchema))
                 builder.HasDefaultSchema(_defaultSchema);
+            else
+                builder.HasDefaultSchema("dbo");
 
-            base.OnModelCreating(builder);
+
+            if (UseAssemblyToScanConfigurations)
+                builder.ApplyConfigurationsFromAssembly(ConfigurationAssemby);
         }
 
         public abstract void Save();
 
+        public abstract Task<int> SaveAsync();
         public abstract Task<int> SaveAsync(CancellationToken cancellationToken = default);
     }
 }

src/ObjRelMapping/Core/Source/DbContext/DbService.cs

@@ -2,11 +2,17 @@ namespace DotNetCenter.Beyond.ObjRelMapping.Core.DbContext
 {
     using DotNetCenter.Beyond.ObjRelMapping.Core.Auditing;
     using System;
+    using System.Reflection;
     using System.Threading;
     using System.Threading.Tasks;
-    public interface DbService<TContext> : IDisposable, IAsyncDisposable, EntryableDbContext, SetableDbContext
+    public interface DbService: IDisposable, IAsyncDisposable, EntryableDbContext, SetableDbContext
     {   
         void Save();
+        Task<int> SaveAsync();
         Task<int> SaveAsync(CancellationToken cancellationToken = default);
+        public string Schema { get; }
+        public Assembly ConfigurationAssemby { get; }
+        public bool UseAssemblyToScanConfigurations { get; }
+        public bool EnableSensitiveDataLogging { get; }
     }
 }

src/ObjRelMapping/Core/Source/DbContext/DesignTime/DefaultDesignTimeDbContextFactoryBase.cs

@@ -17,9 +17,17 @@ public override TContext CreateDbContext(string[] args)
                 .AddJsonFile($"appsettings.{applicationEnvironment}.json", true)
                 .AddEnvironmentVariables()
                 .Build();
-            var path = args[1];
-             basePath = path;
-            Console.WriteLine($"base path : {basePath}");
+            if (args.Length == 1)
+            {
+                basePath = args[0] + $"{separator}";
+                Console.WriteLine($"base path : {basePath}");
+            }
+            if (args.Length == 2)
+            {
+                basePath = args[1] + $"{separator}";
+                Console.WriteLine($"base path : {basePath}");
+            }
+
             return Create(configuration);
         }
     }

src/ObjRelMapping/Core/Source/DbInitializer.cs

@@ -1,9 +1,9 @@
 namespace DotNetCenter.Beyond.ObjRelMapping.Core
 {
     using DotNetCenter.Beyond.ObjRelMapping.Core.DbContext;
-    public interface DbInitializer<TContext>
+    public interface DbInitializer
     {
-        public void Initialize(DbService<TContext> context);
-        public void SeedEverything(DbService<TContext> context);
+        public void Initialize(DbService context);
+        public void SeedEverything(DbService context);
     }
 }

src/ObjRelMapping/Core/Source/DotNetCenter.Beyond.ObjRelMapping.Core.csproj

@@ -59,13 +59,15 @@
 
 	<ItemGroup Condition=" ('$(TargetFramework)' == '$(PrimaryTargetNetFrameworkNames)') OR ('$(TargetFramework)' == '$(SecondaryTargetNetFrameworkNames)')">
 		<PackageReference Include="DotNetCenter.Core" Version="$(DotNetCenterCorePrimaryPackageVersion)" />
+		<PackageReference Include="DotNetCenter.Core.Entities" Version="$(DotNetCenterCoreEntitiesPrimaryPackageVersion)" />
 	</ItemGroup>
 
 
 
 	<ItemGroup Condition="'$(TargetFramework)'=='$(PrimaryTargetNetFrameworkNames)'">
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EfCorePrimaryPackageVarsion)" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCorePrimaryPackageVarsion)" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EfCorePrimaryPackageVarsion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicExtConPrimaryPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicExtConPrimaryPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicExtConPrimaryPackageVersion)" />
@@ -74,13 +76,11 @@
 
 	<ItemGroup Condition="'$(TargetFramework)'=='$(SecondaryTargetNetFrameworkNames)'">
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EfCoreSecondaryPackageVarsion)" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EfCoreSecondaryPackageVarsion)" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreSecondaryPackageVarsion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicExtConSecondaryPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicExtConSecondaryPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicExtConSecondaryPackageVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicExtConSecondaryPackageVersion)" />
 	</ItemGroup>
-
-	<ItemGroup>
-	</ItemGroup>
 </Project>

src/ObjRelMapping/Core/Source/Infrastructure/Common/IAppUser.cs

@@ -0,0 +1,18 @@
+
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common
+{
+    using DotNetCenter.Core.Entities;
+    using System;
+    using System.Collections.Generic;
+
+    public interface IAppUser<TKeyUser, TKeyAuditor>: InfrastructureDao<TKeyUser>, AuditableEntity<TKeyUser, TKeyAuditor>, TrackableEntity
+        where TKeyUser : struct, IEquatable<TKeyUser>
+        where TKeyAuditor : struct, IEquatable<TKeyAuditor>
+    {
+        public string Tag { get; }
+        public string UserName { get; }
+        public string Email { get; }
+        public string DisplayName { get; }
+        //public bool ValidateIdentityUser();
+    }
+}

src/ObjRelMapping/Core/Source/Infrastructure/Common/IDataAccessObject.cs

@@ -0,0 +1,12 @@
+using DotNetCenter.Core;
+using DotNetCenter.Core.Entities;
+using System;
+using Sys = System;
+
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common
+{
+    public interface IDataAccessObject<TKey> : Entity<TKey>
+           where TKey : IEquatable<TKey>
+    {
+    }
+}

src/ObjRelMapping/Core/Source/Infrastructure/Common/InfrastructureDao.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common
+{
+    public interface InfrastructureDao<TKey>
+        where TKey : IEquatable<TKey>
+    {
+    }
+}

src/ObjRelMapping/Core/Source/Infrastructure/Common/PersistableObject.cs

@@ -0,0 +1,11 @@
+using DotNetCenter.Core.Entities;
+using System;
+
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common
+{
+    public interface PersistableObject<TKey, TKeyUser, TKeyAuditor> : InfrastructureDao<TKey>, IDataAccessObject<TKey>, AuditableEntity<TKey, TKeyAuditor>
+        where TKey : struct, IEquatable<TKey>
+        where TKeyAuditor : struct, IEquatable<TKeyAuditor>
+    {
+    }
+}

src/ObjRelMapping/Core/Source/Infrastructure/Common/TrackableEntity.cs

@@ -0,0 +1,6 @@
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common
+{
+    public interface TrackableEntity
+    {
+    }
+}

src/ObjRelMapping/Core/Source/Infrastructure/Configuration/AppConfiguration.cs

@@ -0,0 +1,15 @@
+using DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Common;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
+
+namespace DotNetCenter.Beyond.ObjRelMapping.Core.Infrastructure.Configuration
+{
+    internal interface AppConfiguration<T , TKeyEntity>
+        where T : class
+        where TKeyEntity : IEquatable<TKeyEntity>
+    {
+        public void Configure(EntityTypeBuilder<T> builder);
+
+    }
+}