Add EFCore support and refactor database initialization

- Updated project references to include Genocs.Persistence.EFCore.
- Added `InitializeDatabasesAsync` method for async database initialization.
- Modified `Program.cs` to call the new initialization method.
- Updated `appsettings.json` to include database settings for MSSQL.
- Refactored `ApplicationDbContext` and related classes for clarity and simplicity.
- Introduced `IDapperRepository` for executing raw SQL queries.
- Created `EFCoreExtensions` for EF Core related service registration.
- Cleaned up `Startup.cs` by removing commented-out code and streamlining service registration.

Author: GioemaNocco

src/Genocs.Core.Demo.Domain/Genocs.Core.Demo.Domain.csproj

@@ -8,6 +8,7 @@
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\Genocs.Persistence.MongoDb\Genocs.Persistence.MongoDb.csproj" />
+        <ProjectReference Include="..\Genocs.Persistence.EFCore\Genocs.Persistence.EFCore.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' != 'Debug'">

src/Genocs.Core.Demo.WebApi/Infrastructure/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
-using Genocs.Core.Demo.WebApi.Configurations;
+using Genocs.Common.Persistence.Initialization;
+using Genocs.Core.Demo.WebApi.Configurations;
 using Genocs.ServiceBusAzure.Configurations;
 using Genocs.ServiceBusAzure.Queues;
 using Genocs.ServiceBusAzure.Queues.Interfaces;
@@ -85,4 +86,19 @@ public static IApplicationBuilder UseFirebaseAuthentication(this IApplicationBui
     {
         return builder.UseMiddleware<FirebaseAuthenticationMiddleware>();
     }
+
+    /// <summary>
+    /// Initialize the databases.
+    /// </summary>
+    /// <param name="services">The Service Provider.</param>
+    /// <param name="cancellationToken">The cancellation Token.</param>
+    /// <returns></returns>
+    public static async Task InitializeDatabasesAsync(this IServiceProvider services, CancellationToken cancellationToken = default)
+    {
+        // Create a new scope to retrieve scoped services
+        using var scope = services.CreateScope();
+
+        await scope.ServiceProvider.GetRequiredService<IDatabaseInitializer>()
+            .InitializeDatabasesAsync(cancellationToken);
+    }
 }

src/Genocs.Core.Demo.WebApi/Program.cs

@@ -11,6 +11,7 @@
 using Genocs.Auth;
 using System.Reflection;
 using System.Text.Json.Serialization;
+using Genocs.Persistence.EFCore.Extensions;
 
 StaticLogger.EnsureInitialized();
 
@@ -24,9 +25,10 @@
     .AddGenocs()
     .AddJwt()
     .AddOpenTelemetry()
-    .AddMongo()
-    .AddMongoFast()
-    .RegisterMongoRepositories(Assembly.GetExecutingAssembly())
+    //.AddMongo()
+    //.AddMongoFast()
+    //.RegisterMongoRepositories(Assembly.GetExecutingAssembly())
+    .AddEFCorePersistence()
     .AddApplicationServices()
     .Build();
 
@@ -63,6 +65,8 @@
 
 app.UseGenocs();
 
+await app.Services.InitializeDatabasesAsync();
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

src/Genocs.Core.Demo.WebApi/appsettings.json

@@ -62,6 +62,10 @@
     "database": "demo",
     "enableTracing": true
   },
+  "databaseSettings": {
+    "DBProvider": "mssql",
+    "ConnectionString": "Data Source=(localdb)\\mssqllocaldb;Initial Catalog=Genocs.Microservice.Template;Integrated Security=True;MultipleActiveResultSets=True"
+  },
   "azureKeyVault": {
     "enabled": false,
     "name": "kv-genocs"

src/Genocs.Core/Domain/Repositories/IDapperRepository.cs

@@ -0,0 +1,44 @@
+using System.Data;
+using Genocs.Common.Interfaces;
+using Genocs.Core.Domain.Entities;
+
+namespace Genocs.Core.Domain.Repositories;
+
+public interface IDapperRepository : ITransientService
+{
+    /// <summary>
+    /// Get an <see cref="IReadOnlyList{T}"/> using raw sql string with parameters.
+    /// </summary>
+    /// <typeparam name="T">The type of the entity.</typeparam>
+    /// <param name="sql">The sql string.</param>
+    /// <param name="param">The parameters in the sql string.</param>
+    /// <param name="transaction">The transaction to be performed.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
+    /// <returns>Returns <see cref="Task"/> of <see cref="IReadOnlyCollection{T}"/>.</returns>
+    Task<IReadOnlyList<T>> QueryAsync<T>(string sql, object? param = null, IDbTransaction? transaction = null, CancellationToken cancellationToken = default)
+    where T : class, IEntity;
+
+    /// <summary>
+    /// Get a <typeparamref name="T"/> using raw sql string with parameters.
+    /// </summary>
+    /// <typeparam name="T">The type of the entity.</typeparam>
+    /// <param name="sql">The sql string.</param>
+    /// <param name="param">The parameters in the sql string.</param>
+    /// <param name="transaction">The transaction to be performed.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
+    /// <returns>Returns <see cref="Task"/> of <typeparamref name="T"/>.</returns>
+    Task<T?> QueryFirstOrDefaultAsync<T>(string sql, object? param = null, IDbTransaction? transaction = null, CancellationToken cancellationToken = default)
+    where T : class, IEntity;
+
+    /// <summary>
+    /// Get a <typeparamref name="T"/> using raw sql string with parameters.
+    /// </summary>
+    /// <typeparam name="T">The type of the entity.</typeparam>
+    /// <param name="sql">The sql string.</param>
+    /// <param name="param">The parameters in the sql string.</param>
+    /// <param name="transaction">The transaction to be performed.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
+    /// <returns>Returns <see cref="Task"/> of <typeparamref name="T"/>.</returns>
+    Task<T> QuerySingleAsync<T>(string sql, object? param = null, IDbTransaction? transaction = null, CancellationToken cancellationToken = default)
+    where T : class, IEntity;
+}

src/Genocs.Core/Domain/Repositories/IRepository.cs

@@ -9,8 +9,6 @@ namespace Genocs.Core.Domain.Repositories;
 public interface IRepository<TEntity, in TKey>
        where TEntity : IEntity<TKey>;
 
-
-
 // The Repository for the Application Db
 // I(Read)RepositoryBase<T> is from Ardalis.Specification
 

src/Genocs.Persistence.EFCore/Common/DbProviderKeys.cs

@@ -5,7 +5,7 @@
 /// </summary>
 internal class DbProviderKeys
 {
-    public const string MongoDB = "MongoDB";
+    public const string MongoDB = "mongodb";
     public const string MySql = "mysql";
     public const string Npgsql = "postgresql";
     public const string Oracle = "oracle";

src/Genocs.Persistence.EFCore/Context/ApplicationDbContext.cs

@@ -2,15 +2,4 @@
 
 namespace Genocs.Persistence.EFCore.Context;
 
-public class ApplicationDbContext : DbContext
-{
-    public ApplicationDbContext(DbContextOptions options)
-        : base(options)
-    {
-    }
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        base.OnModelCreating(modelBuilder);
-    }
-}
+public class ApplicationDbContext(DbContextOptions options) : DbContext(options);

src/Genocs.Persistence.EFCore/Startup.cs renamed to src/Genocs.Persistence.EFCore/Extensions/EFCoreExtensions.cs

@@ -1,22 +1,31 @@
+using Genocs.Common.Interfaces;
+using Genocs.Common.Persistence.Initialization;
+using Genocs.Core.Builders;
+using Genocs.Core.Domain.ConnectionString;
+using Genocs.Core.Domain.Entities;
+using Genocs.Core.Domain.Repositories;
 using Genocs.Persistence.EFCore.Common;
+using Genocs.Persistence.EFCore.Configurations;
+using Genocs.Persistence.EFCore.Context;
+using Genocs.Persistence.EFCore.Initialization;
+using Genocs.Persistence.EFCore.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
 using Serilog;
 
-using Genocs.Core.Domain.Repositories;
-using Genocs.Persistence.EFCore.Repositories;
-
-namespace Genocs.Persistence.EFCore;
+namespace Genocs.Persistence.EFCore.Extensions;
 
-internal static class Startup
+public static class EFCoreExtensions
 {
-    private static readonly ILogger _logger = Log.ForContext(typeof(Startup));
+    private static readonly ILogger _logger = Log.ForContext(typeof(EFCoreExtensions));
 
-    internal static IServiceCollection AddPersistence(this IServiceCollection services)
+    public static IGenocsBuilder AddEFCorePersistence(this IGenocsBuilder builder)
     {
-
-        services
+        // Bind the configuration section to the DatabaseSettings class
+        // and validate it
+        builder.Services
             .AddOptions<DatabaseSettings>()
             .BindConfiguration(nameof(DatabaseSettings))
             .PostConfigure(databaseSettings =>
@@ -25,9 +34,10 @@ internal static IServiceCollection AddPersistence(this IServiceCollection servic
             })
             .ValidateDataAnnotations()
             .ValidateOnStart();
-        /*
-        return services
-            .AddDbContext<MultitenantApplicationDbContext>((p, m) =>
+
+        // Add the DbContext and other services
+        builder.Services
+            .AddDbContext<ApplicationDbContext>((p, m) =>
             {
                 var databaseSettings = p.GetRequiredService<IOptions<DatabaseSettings>>().Value;
                 m.UseDatabase(databaseSettings.DBProvider, databaseSettings.ConnectionString);
@@ -41,11 +51,46 @@ internal static IServiceCollection AddPersistence(this IServiceCollection servic
             .AddTransient<IConnectionStringValidator, ConnectionStringValidator>()
             .AddRepositories();
 
-        */
+        return builder;
+    }
+
+    internal static IServiceCollection AddServices(this IServiceCollection services) =>
+        services
+            .AddServices(typeof(ITransientService), ServiceLifetime.Transient)
+            .AddServices(typeof(IScopedService), ServiceLifetime.Scoped);
+
+    internal static IServiceCollection AddServices(this IServiceCollection services, Type interfaceType, ServiceLifetime lifetime)
+    {
+        var interfaceTypes =
+            AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(s => s.GetTypes())
+                .Where(t => interfaceType.IsAssignableFrom(t)
+                            && t.IsClass && !t.IsAbstract)
+                .Select(t => new
+                {
+                    Service = t.GetInterfaces().FirstOrDefault(),
+                    Implementation = t
+                })
+                .Where(t => t.Service is not null
+                            && interfaceType.IsAssignableFrom(t.Service));
+
+        foreach (var type in interfaceTypes)
+        {
+            services.AddService(type.Service!, type.Implementation, lifetime);
+        }
 
         return services;
     }
 
+    internal static IServiceCollection AddService(this IServiceCollection services, Type serviceType, Type implementationType, ServiceLifetime lifetime) =>
+        lifetime switch
+        {
+            ServiceLifetime.Transient => services.AddTransient(serviceType, implementationType),
+            ServiceLifetime.Scoped => services.AddScoped(serviceType, implementationType),
+            ServiceLifetime.Singleton => services.AddSingleton(serviceType, implementationType),
+            _ => throw new ArgumentException("Invalid lifeTime", nameof(lifetime))
+        };
+
     internal static DbContextOptionsBuilder UseDatabase(this DbContextOptionsBuilder builder, string dbProvider, string connectionString)
     {
         return dbProvider.ToLowerInvariant() switch
@@ -69,11 +114,9 @@ internal static DbContextOptionsBuilder UseDatabase(this DbContextOptionsBuilder
 
     private static IServiceCollection AddRepositories(this IServiceCollection services)
     {
-
         // Add Repositories
-        services.AddScoped(typeof(IRepository<,>), typeof(ApplicationDbRepository<>));
+        services.AddScoped(typeof(IRepository<>), typeof(ApplicationDbRepository<>));
 
-        /*
         foreach (var aggregateRootType in
             typeof(IAggregateRoot).Assembly.GetExportedTypes()
                 .Where(t => typeof(IAggregateRoot).IsAssignableFrom(t) && t.IsClass)
@@ -84,13 +127,12 @@ private static IServiceCollection AddRepositories(this IServiceCollection servic
                 sp.GetRequiredService(typeof(IRepository<>).MakeGenericType(aggregateRootType)));
 
             // Decorate the repositories with EventAddingRepositoryDecorators and expose them as IRepositoryWithEvents.
-            services.AddScoped(typeof(IRepositoryWithEvents<>).MakeGenericType(aggregateRootType), sp =>
-                Activator.CreateInstance(
-                    typeof(EventAddingRepositoryDecorator<>).MakeGenericType(aggregateRootType),
-                    sp.GetRequiredService(typeof(IRepository<>).MakeGenericType(aggregateRootType)))
-                ?? throw new InvalidOperationException($"Couldn't create EventAddingRepositoryDecorator for aggregateRootType {aggregateRootType.Name}"));
+            //services.AddScoped(typeof(IRepositoryWithEvents<>).MakeGenericType(aggregateRootType), sp =>
+            //    Activator.CreateInstance(
+            //        typeof(EventAddingRepositoryDecorator<>).MakeGenericType(aggregateRootType),
+            //        sp.GetRequiredService(typeof(IRepository<>).MakeGenericType(aggregateRootType)))
+            //    ?? throw new InvalidOperationException($"Couldn't create EventAddingRepositoryDecorator for aggregateRootType {aggregateRootType.Name}"));
         }
-        */
 
         return services;
     }

src/Genocs.Persistence.EFCore/Genocs.Persistence.EFCore.csproj

@@ -58,8 +58,4 @@
         <PackageReference Include="MongoDB.EntityFrameworkCore" Version="9.0.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Extensions\" />
-    </ItemGroup>
-
 </Project>