Add repository registration to DependencyInjection

Added a `RegsRepository` queue to manage repository registrations. Introduced `RegisterDefaultRepository<TDbContext, TEntity>()` to enqueue scoped repository registrations. Updated `RegisterAllServices` to process the `RegsRepository` queue during service registration.
Refactor method names for clarity in IRepository/DbRepository
2025-12-19 09:25:58 +01:00 · 2025-12-19 09:20:18 +01:00 · 2025-12-19 09:05:59 +01:00 · 2025-12-19 08:57:18 +01:00 · 2025-12-18 22:09:45 +01:00 · 2025-12-18 21:54:22 +01:00
4 changed files with 65 additions and 24 deletions
--- a/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj
+++ b/DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj
@@ -37,7 +37,7 @@
 	<ImplicitUsings>enable</ImplicitUsings>
 	<LangVersion>latest</LangVersion>
  </PropertyGroup>
-
+	
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
@@ -52,24 +52,28 @@
 	<PackageReference Include="AutoMapper" Version="10.1.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="3.1.32" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	<PackageReference Include="AutoMapper" Version="13.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.20" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	<PackageReference Include="AutoMapper" Version="14.0.0" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.15" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	<PackageReference Include="AutoMapper" Version="14.0.0" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
 	<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.5" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.5" />
  </ItemGroup>

  <ItemGroup>
--- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
@@ -1,4 +1,5 @@
 using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore.Query;
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
@@ -8,11 +9,29 @@ using System.Linq;
 #endif

 namespace DigitalData.Core.Abstraction.Application.Repository
-#if NET
-    ;
-#elif NETFRAMEWORK
+{
+    public interface IRepository
    {
+#if NET
+    public
 #endif
+        Task<int> ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default);
+
+#if NET
+    public
+#endif
+        Task<int> ExecuteQueryInterpolatedAsync(FormattableString sql, CancellationToken cancel = default);
+
+#if NET
+    public
+#endif
+        int ExecuteQueryRaw([NotParameterized] string sql, params object[] parameters);
+
+#if NET
+    public
+#endif
+        int ExecuteQueryInterpolated(FormattableString sql);
+    }

    public interface IRepository<TEntity>
    {
@@ -44,6 +63,16 @@ namespace DigitalData.Core.Abstraction.Application.Repository
 #endif
        IQueryable<TEntity> Query { get; }

+#if NET
+    public
+#endif
+        IQueryable<TEntity> QueryRaw([NotParameterized] string sql, params object[] parameters);
+
+#if NET
+    public
+#endif
+        IQueryable<TEntity> QueryInterpolated([NotParameterized] FormattableString sql);
+
 #if NET
    public
 #endif
@@ -108,6 +137,4 @@ namespace DigitalData.Core.Abstraction.Application.Repository
        IQueryable<TEntity> ReadOnly();
        #endregion
    }
-#if NETFRAMEWORK
-    }
-#endif
+}
--- a/DigitalData.Core.Infrastructure/DbRepository.cs
+++ b/DigitalData.Core.Infrastructure/DbRepository.cs
@@ -13,13 +13,8 @@ using System.Threading.Tasks;
 #endif

 namespace DigitalData.Core.Infrastructure
-#if NET
-    ;
-#elif NETFRAMEWORK
-    {
-#endif
-
-    public class DbRepository<TDbContext> where TDbContext : DbContext
+{
+    public class DbRepository<TDbContext> : IRepository where TDbContext : DbContext
    {
        protected internal readonly TDbContext Context;

@@ -28,12 +23,22 @@ namespace DigitalData.Core.Infrastructure
            Context = context;
        }

-        public int ExecuteSqlRaw([NotParameterized] string sql, params object[] parameters)
+        public Task<int> ExecuteQueryRawAsync([NotParameterized] string sql, IEnumerable<object> parameters, CancellationToken cancel = default)
+        {
+            return Context.Database.ExecuteSqlRawAsync(sql, parameters, cancel);
+        }
+
+        public Task<int> ExecuteQueryInterpolatedAsync(FormattableString sql, CancellationToken cancel = default)
+        {
+            return Context.Database.ExecuteSqlInterpolatedAsync(sql, cancel);
+        }
+
+        public int ExecuteQueryRaw([NotParameterized] string sql, params object[] parameters)
        {
            return Context.Database.ExecuteSqlRaw(sql, parameters);
        }

-        public int ExecuteSqlInterpolated(FormattableString sql)
+        public int ExecuteQueryInterpolated(FormattableString sql)
        {
            return Context.Database.ExecuteSqlInterpolated(sql);
        }
@@ -62,11 +67,6 @@ namespace DigitalData.Core.Infrastructure
            Mapper = mapper;
        }

-        public IQueryable<TEntity> Sql([NotParameterized] string sql, params object[] parameters)
-        {
-            return Entities.FromSqlRaw(sql, parameters);
-        }
-
        #region Create
        public virtual async Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancel = default)
        {
@@ -100,6 +100,10 @@ namespace DigitalData.Core.Infrastructure
        #region Read
        public virtual IQueryable<TEntity> Query => Entities.AsNoTracking();

+        public IQueryable<TEntity> QueryRaw([NotParameterized] string sql, params object[] parameters) => Entities.FromSqlRaw(sql, parameters);
+
+        public IQueryable<TEntity> QueryInterpolated([NotParameterized] FormattableString sql) => Entities.FromSqlInterpolated(sql);
+
        public virtual IQueryable<TEntity> Where(Expression<Func<TEntity, bool>> expression) => Entities.AsNoTracking().Where(expression);

        public virtual IEnumerable<TEntity> GetAll() => Entities.AsNoTracking().ToList();
@@ -155,6 +159,4 @@ namespace DigitalData.Core.Infrastructure
        public virtual IQueryable<TEntity> ReadOnly() => Entities.AsNoTracking();
        #endregion
    }
-#if NETFRAMEWORK
-    }
-#endif
+}
--- a/DigitalData.Core.Infrastructure/DependencyInjection.cs
+++ b/DigitalData.Core.Infrastructure/DependencyInjection.cs
@@ -40,6 +40,9 @@ public static class DependencyInjection
        // 3. register db set factories (can overwrite)
        private readonly Queue<Action<IServiceCollection>> RegsDbSetFactory = new Queue<Action<IServiceCollection>>();

+        // 4. register repository
+        private readonly Queue<Action<IServiceCollection>> RegsRepository = new Queue<Action<IServiceCollection>>();
+        
        internal void RegisterAllServices(IServiceCollection services)
        {
            // 1. register from assembly
@@ -113,6 +116,11 @@ public static class DependencyInjection
            where TDbContext : DbContext
            where TEntity : class
            => RegsDbSetFactory.Enqueue(s => s.AddDbSetFactory(dbSetFactory));
+    
+        public void RegisterDefaultRepository<TDbContext, TEntity>()
+            where TDbContext : DbContext
+            where TEntity : class
+            => RegsRepository.Enqueue(s => s.AddScoped<IRepository<TEntity>, DbRepository<TDbContext, TEntity>>());
    }

    private static void InvokeAll<T>(this Queue<Action<T>> queue, T services)
Author	SHA1	Message	Date
Developer 02	d2302560f1	Add repository registration to DependencyInjection Added a `RegsRepository` queue to manage repository registrations. Introduced `RegisterDefaultRepository<TDbContext, TEntity>()` to enqueue scoped repository registrations. Updated `RegisterAllServices` to process the `RegsRepository` queue during service registration.	2025-12-19 09:25:58 +01:00
Developer 02	42c0dc7206	Refactor method names for clarity in IRepository/DbRepository Renamed methods in `IRepository` and `DbRepository` to replace `Sql` with `Query` for improved clarity and consistency. - Updated `IRepository` methods: - `ExecuteSqlRawAsync` -> `ExecuteQueryRawAsync` - `ExecuteSqlInterpolatedAsync` -> `ExecuteQueryInterpolatedAsync` - `ExecuteSqlRaw` -> `ExecuteQueryRaw` - `ExecuteSqlInterpolated` -> `ExecuteQueryInterpolated` - Updated `DbRepository` methods: - `ExecuteSqlRawAsync` -> `ExecuteQueryRawAsync` - `ExecuteSqlInterpolatedAsync` -> `ExecuteQueryInterpolatedAsync` - `ExecuteSqlRaw` -> `ExecuteQueryRaw` - `ExecuteSqlInterpolated` -> `ExecuteQueryInterpolated` - Fixed `DbRepository` class declaration by removing the incorrect constraint requiring `TDbContext` to implement `IRepository`.	2025-12-19 09:20:18 +01:00
Developer 02	82686db38b	Add QueryRaw and QueryInterpolated methods to repository Added `QueryRaw` and `QueryInterpolated` methods to the `IRepository` interface for raw and interpolated SQL queries, conditionally compiled for the `NET` target framework. Removed the `Sql` method from `DbRepository` and replaced it with implementations of `QueryRaw` and `QueryInterpolated` using `Entities.FromSqlRaw` and `Entities.FromSqlInterpolated`. Updated the `Query` property in `DbRepository` to use `Entities.AsNoTracking()` for read-only queries.	2025-12-19 09:05:59 +01:00
Developer 02	ce5c59dfc2	Update DbRepository to require IRepository constraint The `DbRepository` class now enforces that the generic type parameter `TDbContext` must implement the `IRepository` interface in addition to inheriting from `DbContext`. This ensures that `DbRepository` can leverage functionality provided by the `IRepository` interface, improving type safety and consistency.	2025-12-19 08:57:18 +01:00
Developer 02	5c3db6886a	Add EF Core support and refactor IRepository interface Updated project dependencies to include `Microsoft.EntityFrameworkCore.Abstractions` for multiple target frameworks (`net462`, `net7.0`, `net8.0`, `net9.0`). Added `Microsoft.Extensions.*` package references to the project file. Enhanced `IRepository` interface with methods for executing raw and interpolated SQL queries (`ExecuteSqlRawAsync`, `ExecuteSqlInterpolatedAsync`, etc.). Adjusted method declarations to support conditional compilation for `NET` and `NETFRAMEWORK`. Refactored namespace structure in `IRepository.cs` to simplify and remove unnecessary conditional compilation directives.	2025-12-18 22:09:45 +01:00
Developer 02	144178a504	Add async SQL execution methods to DbRepository Added `ExecuteSqlRawAsync` and `ExecuteSqlInterpolatedAsync` methods to the `DbRepository` class for asynchronous SQL execution. Updated the `System.Linq` namespace import to support LINQ operations. Simplified conditional compilation directives by consistently enclosing the class declaration in braces `{}` across frameworks. Adjusted closing braces to align with the updated structure.	2025-12-18 21:54:22 +01:00