From 048ba35804fe9155c48dd4df517014ca0467bdcf Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Thu, 21 Aug 2025 18:19:16 +0200
Subject: [PATCH] remove ReadQuery

---
 .../Repository/Extensions.cs                  | 14 ---
 .../Repository/IReadQuery.cs                  | 85 -------------------
 .../Repository/IRepository.cs                 | 18 +---
 .../Repository/RepositoryExtensions.cs        | 14 ---
 ...italData.Core.Exceptions.Middleware.csproj |  6 +-
 .../DbRepository.cs                           | 31 +------
 DigitalData.Core.Infrastructure/ReadQuery.cs  | 48 -----------
 7 files changed, 10 insertions(+), 206 deletions(-)
 delete mode 100644 DigitalData.Core.Abstraction.Application/Repository/IReadQuery.cs
 delete mode 100644 DigitalData.Core.Abstraction.Application/Repository/RepositoryExtensions.cs
 delete mode 100644 DigitalData.Core.Infrastructure/ReadQuery.cs

diff --git a/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs b/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
index 3b0f3d9..9d86ac5 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
@@ -17,18 +17,4 @@ public static class Extensions
         return repository.CreateAsync(entities, ct);
     }
     #endregion
-
-    #region Read
-    public static async Task<TEntity?> ReadFirstOrDefaultAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
-        => (await repository.ReadAllAsync(expression)).FirstOrDefault();
-
-    public static async Task<TEntity> ReadFirstAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
-        => (await repository.ReadAllAsync(expression)).First();
-
-    public static async Task<TEntity?> ReadSingleOrDefaultAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
-        => (await repository.ReadAllAsync(expression)).SingleOrDefault();
-
-    public static async Task<TEntity> ReadSingleAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
-        => (await repository.ReadAllAsync(expression)).Single();
-    #endregion
 }
diff --git a/DigitalData.Core.Abstraction.Application/Repository/IReadQuery.cs b/DigitalData.Core.Abstraction.Application/Repository/IReadQuery.cs
deleted file mode 100644
index b560722..0000000
--- a/DigitalData.Core.Abstraction.Application/Repository/IReadQuery.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System.Linq.Expressions;
-
-namespace DigitalData.Core.Abstraction.Application.Repository;
-
-/// <summary>
-/// Provides methods for executing common queries on a given entity type.
-/// This interface abstracts away the direct usage of ORM libraries (such as Entity Framework) for querying data
-/// and provides asynchronous and synchronous operations for querying a collection or single entity.
-/// </summary>
-/// <typeparam name="TEntity">The type of the entity being queried.</typeparam>
-public interface IReadQuery<TEntity>
-{
-    /// <summary>
-    /// Adds a filter to the query using the specified predicate expression.
-    /// This method allows chaining multiple filter conditions to refine the query results.
-    /// </summary>
-    /// <param name="expression">An expression that defines the filter condition for the entity.</param>
-    /// <returns>The current <see cref="IReadQuery{TEntity}"/> instance with the applied filter.</returns>
-    public IReadQuery<TEntity> Where(Expression<Func<TEntity, bool>> expression);
-
-    /// <summary>
-    /// Asynchronously retrieves the first entity or a default value if no entity is found.
-    /// </summary>
-    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
-    public Task<TEntity?> FirstOrDefaultAsync(CancellationToken cancellation = default);
-
-    /// <summary>
-    /// Asynchronously retrieves a single entity or a default value if no entity is found.
-    /// </summary>
-    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
-    public Task<TEntity?> SingleOrDefaultAsync(CancellationToken cancellation = default);
-
-    /// <summary>
-    /// Asynchronously retrieves a list of entities.
-    /// </summary>
-    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains the list of entities.</returns>
-    public Task<IEnumerable<TEntity>> ToListAsync(CancellationToken cancellation = default);
-
-    /// <summary>
-    /// Asynchronously retrieves the first entity. Throws an exception if no entity is found.
-    /// </summary>
-    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains the first entity.</returns>
-    public Task<TEntity> FirstAsync(CancellationToken cancellation = default);
-
-    /// <summary>
-    /// Asynchronously retrieves a single entity. Throws an exception if no entity is found.
-    /// </summary>
-    /// <param name="cancellation">A <see cref="CancellationToken"/> to observe while waiting for the task to complete.</param>
-    /// <returns>A task that represents the asynchronous operation. The task result contains the single entity.</returns>
-    public Task<TEntity> SingleAsync(CancellationToken cancellation = default);
-
-    /// <summary>
-    /// Synchronously retrieves the first entity or a default value if no entity is found.
-    /// </summary>
-    /// <returns>The first entity or a default value.</returns>
-    public TEntity? FirstOrDefault();
-
-    /// <summary>
-    /// Synchronously retrieves a single entity or a default value if no entity is found.
-    /// </summary>
-    /// <returns>The single entity or a default value.</returns>
-    public TEntity? SingleOrDefault();
-
-    /// <summary>
-    /// Synchronously retrieves a list of entities.
-    /// </summary>
-    /// <returns>The list of entities.</returns>
-    public IEnumerable<TEntity> ToList();
-
-    /// <summary>
-    /// Synchronously retrieves the first entity. Throws an exception if no entity is found.
-    /// </summary>
-    /// <returns>The first entity.</returns>
-    public TEntity First();
-
-    /// <summary>
-    /// Synchronously retrieves a single entity. Throws an exception if no entity is found.
-    /// </summary>
-    /// <returns>The single entity.</returns>
-    public TEntity Single();
-}
\ No newline at end of file
diff --git a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
index 081ad0c..cd51800 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
@@ -10,23 +10,11 @@ public interface IRepository<TEntity>
 
     public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancellation = default);
 
-    public IReadQuery<TEntity> Read(params Expression<Func<TEntity, bool>>[] expressions);
+    public IQueryable<TEntity> Read();
+
+    public IQueryable<TEntity> ReadOnly();
 
     public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
 
     public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
-
-    #region Obsolete
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken cancellation = default);
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken cancellation = default);
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken cancellation = default);
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken cancellation = default);
-    #endregion
 }
diff --git a/DigitalData.Core.Abstraction.Application/Repository/RepositoryExtensions.cs b/DigitalData.Core.Abstraction.Application/Repository/RepositoryExtensions.cs
deleted file mode 100644
index e9efa5d..0000000
--- a/DigitalData.Core.Abstraction.Application/Repository/RepositoryExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Linq.Expressions;
-
-namespace DigitalData.Core.Abstraction.Application.Repository;
-
-public static class RepositoryExtensions
-{
-    public static IReadQuery<TEntity> Where<TEntity>(this IReadQuery<TEntity> query, params Expression<Func<TEntity, bool>>[] expressions)
-    {
-        foreach (var expression in expressions)
-            query = query.Where(expression);
-
-        return query;
-    }
-}
\ No newline at end of file
diff --git a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
index 9feae0a..8f65cfd 100644
--- a/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
+++ b/DigitalData.Core.Exceptions.Middleware/DigitalData.Core.Exceptions.Middleware.csproj
@@ -17,9 +17,9 @@
 	  <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
 	  <PackAsTool>False</PackAsTool>
 	  <PackageIcon>core_icon.png</PackageIcon>
-	  <Version>1.0.0</Version>
-	  <AssemblyVersion>1.0.0</AssemblyVersion>
-	  <FileVersion>1.0.0</FileVersion>
+	  <Version>1.0.1</Version>
+	  <AssemblyVersion>1.0.1</AssemblyVersion>
+	  <FileVersion>1.0.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DigitalData.Core.Infrastructure/DbRepository.cs b/DigitalData.Core.Infrastructure/DbRepository.cs
index ec3869c..031b2ed 100644
--- a/DigitalData.Core.Infrastructure/DbRepository.cs
+++ b/DigitalData.Core.Infrastructure/DbRepository.cs
@@ -33,8 +33,10 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
         return entities;
     }
 
-    public IReadQuery<TEntity> Read(params Expression<Func<TEntity, bool>>[] expressions) => new ReadQuery<TEntity>(Entities.AsNoTracking()).Where(expressions);
-    
+    public IQueryable<TEntity> Read() => Entities.AsQueryable();
+
+    public IQueryable<TEntity> ReadOnly() => Entities.AsNoTracking();
+
     public virtual async Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
     {
         var entities = await Entities.Where(expression).ToListAsync(ct);
@@ -59,29 +61,4 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
 
         await Context.SaveChangesAsync(ct);
     }
-
-    #region Obsolete
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public virtual async Task<IEnumerable<TEntity>> ReadAllAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
-        => expression is null
-            ? await Entities.AsNoTracking().ToListAsync(ct)
-            : await Entities.AsNoTracking().Where(expression).ToListAsync(ct);
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public virtual async Task<TEntity?> ReadOrDefaultAsync(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
-        => single
-            ? await Entities.AsNoTracking().Where(expression).SingleOrDefaultAsync(ct)
-            : await Entities.AsNoTracking().Where(expression).FirstOrDefaultAsync(ct);
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public virtual async Task<IEnumerable<TDto>> ReadAllAsync<TDto>(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
-        => Mapper.Map<TDto>(await ReadAllAsync(expression, ct));
-
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public virtual async Task<TDto?> ReadOrDefaultAsync<TDto>(Expression<Func<TEntity, bool>> expression, bool single = true, CancellationToken ct = default)
-    {
-        var entity = await ReadOrDefaultAsync(expression, single, ct);
-        return entity is null ? default : Mapper.Map<TDto>(entity);
-    }
-    #endregion
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Infrastructure/ReadQuery.cs b/DigitalData.Core.Infrastructure/ReadQuery.cs
deleted file mode 100644
index 6ade520..0000000
--- a/DigitalData.Core.Infrastructure/ReadQuery.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Expressions;
-
-namespace DigitalData.Core.Infrastructure;
-
-public sealed record ReadQuery<TEntity> : IReadQuery<TEntity>
-{
-    private IQueryable<TEntity> _query;
-
-    internal ReadQuery(IQueryable<TEntity> queryable)
-    {
-        _query = queryable;
-    }
-
-    public TEntity First() => _query.First();
-
-    public Task<TEntity> FirstAsync(CancellationToken cancellation = default) => _query.FirstAsync(cancellation);
-
-    public TEntity? FirstOrDefault() => _query.FirstOrDefault();
-
-
-    public Task<TEntity?> FirstOrDefaultAsync(CancellationToken cancellation = default) => _query.FirstOrDefaultAsync(cancellation);
-
-
-    public TEntity Single() => _query.Single();
-
-
-    public Task<TEntity> SingleAsync(CancellationToken cancellation = default) => _query.SingleAsync(cancellation);
-
-
-    public TEntity? SingleOrDefault() => _query.SingleOrDefault();
-
-
-    public Task<TEntity?> SingleOrDefaultAsync(CancellationToken cancellation = default) => _query.SingleOrDefaultAsync(cancellation);
-
-
-    public IEnumerable<TEntity> ToList() => _query.ToList();
-
-
-    public async Task<IEnumerable<TEntity>> ToListAsync(CancellationToken cancellation = default) => await _query.ToListAsync(cancellation);
-
-    public IReadQuery<TEntity> Where(Expression<Func<TEntity, bool>> expression)
-    {
-        _query = _query.Where(expression);
-        return this;
-    }
-}
\ No newline at end of file