chore: bump to x.x.1

Changed UpdateAsync and DeleteAsync to accept Func<IQueryable<TEntity>, IQueryable<TEntity>> instead of IQueryable<TEntity>

Improved flexibility by allowing callers to compose queries dynamically

Updated overloads to wrap expressions with q => q.Where(expression) for compatibility

DigitalData.Core.Abstraction.Application/DigitalData.Core.Abstraction.Application.csproj

@@ -14,9 +14,9 @@
     <PackageIcon>core_icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <PackageTags>digital data core application clean architecture abstraction</PackageTags>
-    <Version>1.1.0</Version>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.1.0</FileVersion>
+    <Version>1.2.1</Version>
+    <AssemblyVersion>1.2.1</AssemblyVersion>
+    <FileVersion>1.2.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

DigitalData.Core.Abstraction.Application/Repository/IRepository.cs

@@ -6,15 +6,19 @@ public interface IRepository<TEntity>
 {
     public IEntityMapper<TEntity> Mapper { get; }
 
-    public Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancellation = default);
+    public Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancel = default);
 
-    public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancellation = default);
+    public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancel = default);
 
     public IQueryable<TEntity> Read();
 
     public IQueryable<TEntity> ReadOnly();
 
-    public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
+    public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default);
 
-    public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellation = default);
+    public Task UpdateAsync<TDto>(TDto dto, Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default);
+
+    public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default);
+
+    public Task DeleteAsync(Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default);
 }

DigitalData.Core.Infrastructure/DbRepository.cs

@@ -19,17 +19,17 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
         Mapper = mapper;
     }
 
-    public virtual async Task<TEntity> CreateAsync(TEntity entity, CancellationToken ct = default)
+    public virtual async Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancel = default)
     {
         Entities.Add(entity);
-        await Context.SaveChangesAsync(ct);
+        await Context.SaveChangesAsync(cancel);
         return entity;
     }
 
-    public virtual async Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken ct = default)
+    public virtual async Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancel = default)
     {
         Entities.AddRange(entities);
-        await Context.SaveChangesAsync(ct);
+        await Context.SaveChangesAsync(cancel);
         return entities;
     }
 
@@ -37,9 +37,11 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
 
     public IQueryable<TEntity> ReadOnly() => Entities.AsNoTracking();
 
-    public virtual async Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
+    public virtual Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default) => UpdateAsync(dto, q => q.Where(expression), cancel);
+
+    public virtual async Task UpdateAsync<TDto>(TDto dto, Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default)
     {
-        var entities = await Entities.Where(expression).ToListAsync(ct);
+        var entities = await query(Entities).ToListAsync(cancel);
 
         for (int i = entities.Count - 1; i >= 0; i--)
         {
@@ -47,18 +49,20 @@ public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbC
             Entities.Update(entities[i]);
         }
 
-        await Context.SaveChangesAsync(ct);
+        await Context.SaveChangesAsync(cancel);
     }
 
-    public virtual async Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
+    public virtual Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default) => DeleteAsync(q => q.Where(expression), cancel);
+
+    public virtual async Task DeleteAsync(Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default)
     {
-        var entities = await Entities.Where(expression).ToListAsync(ct);
+        var entities = await query(Entities).ToListAsync(cancel);
 
         for (int i = entities.Count - 1; i >= 0; i--)
         {
             Entities.Remove(entities[i]);
         }
 
-        await Context.SaveChangesAsync(ct);
+        await Context.SaveChangesAsync(cancel);
     }
 }

DigitalData.Core.Infrastructure/DigitalData.Core.Infrastructure.csproj

@@ -15,9 +15,9 @@
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <RepositoryType>digital data core abstractions clean architecture</RepositoryType>
     <PackageTags>digital data core infrastructure clean architecture</PackageTags>
-    <Version>2.2.0</Version>
-    <AssemblyVersion>2.2.0</AssemblyVersion>
-    <FileVersion>2.2.0</FileVersion>
+    <Version>2.3.1</Version>
+    <AssemblyVersion>2.3.1</AssemblyVersion>
+    <FileVersion>2.3.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>