hrynco/hrynco-notification-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: replace local dal abstractions with hrynco-ef packages

Browse Source 
Remove duplicate IEntity, Entity, ITransaction, IUnitOfWork, EfRepository,
EfUnitOfWork, EfTransactionAdapter — now consumed from HrynCo.DAL.Abstract
and HrynCo.DAL.EF packages (1.0.1).

Ref: IT-0
This commit is contained in:
Anatolii Grynchuk
2026-05-05 20:39:06 +03:00
parent 49982fc27f
commit ee4c988a0d
38 changed files with 39 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HrynCo.NotificationService.DAL.EF/Core/EfRepository.cs
-45
View File
@@ -1,45 +0,0 @@
using System.Linq.Expressions;
using Microsoft.EntityFrameworkCore;
namespace HrynCo.NotificationService.DAL.EF.Core;
internal abstract class EfRepository<TEntity>
where TEntity : class
{
protected NotificationDbContext DbContext { get; }
protected DbSet<TEntity> DbSet { get; }
protected EfRepository(NotificationDbContext dbContext)
{
DbContext = dbContext;
DbSet = dbContext.Set<TEntity>();
}
protected async Task AddAsync(TEntity entity, CancellationToken ct = default)
{
await DbSet.AddAsync(entity, ct);
}
protected async Task AddRangeAsync(IEnumerable<TEntity> entities, CancellationToken ct = default)
{
await DbSet.AddRangeAsync(entities, ct);
}
protected void Update(TEntity entity)
{
DbSet.Update(entity);
}
protected void Delete(TEntity entity)
{
DbSet.Remove(entity);
}
protected void DeleteRange(IEnumerable<TEntity> entities)
{
DbSet.RemoveRange(entities);
}
protected Task<bool> ExistsAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken ct = default) =>
DbSet.AnyAsync(predicate, ct);
}
HrynCo.NotificationService.DAL.EF/Core/EfTransactionAdapter.cs
-29
View File
@@ -1,29 +0,0 @@
using HrynCo.NotificationService.DAL.Abstract;
using Microsoft.EntityFrameworkCore.Storage;
namespace HrynCo.NotificationService.DAL.EF.Core;
internal sealed class EfTransactionAdapter : ITransaction
{
private readonly IDbContextTransaction _transaction;
internal EfTransactionAdapter(IDbContextTransaction transaction)
{
_transaction = transaction;
}
public Task CommitAsync(CancellationToken cancellationToken = default)
{
return _transaction.CommitAsync(cancellationToken);
}
public Task RollbackAsync(CancellationToken cancellationToken = default)
{
return _transaction.RollbackAsync(cancellationToken);
}
public ValueTask DisposeAsync()
{
return _transaction.DisposeAsync();
}
}
HrynCo.NotificationService.DAL.EF/Core/EfUnitOfWork.cs
-105
View File
@@ -1,105 +0,0 @@
using HrynCo.NotificationService.DAL.Abstract;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
namespace HrynCo.NotificationService.DAL.EF.Core;
internal abstract class EfUnitOfWork<TDbContext> : IUnitOfWork
where TDbContext : DbContext
{
private readonly TDbContext _context;
private EfTransactionAdapter? _currentTransaction;
protected EfUnitOfWork(TDbContext context)
{
_context = context;
}
public Task SaveChangesAsync(CancellationToken cancellationToken = default)
{
return _context.SaveChangesAsync(cancellationToken);
}
public async Task<ITransaction> BeginTransactionAsync(CancellationToken cancellationToken = default)
{
if (_currentTransaction != null)
{
return _currentTransaction;
}
IDbContextTransaction tx = await _context.Database.BeginTransactionAsync(cancellationToken);
_currentTransaction = new EfTransactionAdapter(tx);
return _currentTransaction;
}
public ITransaction? GetCurrentTransaction()
{
return _currentTransaction;
}
public async Task ExecuteInTransactionAsync(Func<Task> action)
{
ITransaction? existing = GetCurrentTransaction();
bool ownsTransaction = existing is null;
ITransaction tx = existing ?? await BeginTransactionAsync();
try
{
await action();
if (ownsTransaction)
{
await tx.CommitAsync();
}
}
catch
{
if (ownsTransaction)
{
await tx.RollbackAsync();
}
throw;
}
finally
{
if (ownsTransaction)
{
await tx.DisposeAsync();
}
}
}
public async Task<TResult> ExecuteInTransactionAsync<TResult>(Func<Task<TResult>> action)
{
ITransaction? existing = GetCurrentTransaction();
bool ownsTransaction = existing is null;
ITransaction tx = existing ?? await BeginTransactionAsync();
try
{
TResult result = await action();
if (ownsTransaction)
{
await tx.CommitAsync();
}
return result;
}
catch
{
if (ownsTransaction)
{
await tx.RollbackAsync();
}
throw;
}
finally
{
if (ownsTransaction)
{
await tx.DisposeAsync();
}
}
}
}
HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs
+2
View File
@@ -1,3 +1,5 @@
using HrynCo.DAL.EF.Core;
namespace HrynCo.NotificationService.DAL.EF.Core;
internal sealed class UnitOfWork : EfUnitOfWork<NotificationDbContext>
HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using HrynCo.NotificationService.DAL.Abstract.Entities;
using HrynCo.DAL.Abstract.Entities;
using HrynCo.NotificationService.DAL.Abstract.Providers;
namespace HrynCo.NotificationService.DAL.EF.Entities;
HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using HrynCo.NotificationService.DAL.Abstract.Entities;
using HrynCo.DAL.Abstract.Entities;
namespace HrynCo.NotificationService.DAL.EF.Entities;
HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using HrynCo.NotificationService.DAL.Abstract.Entities;
using HrynCo.DAL.Abstract.Entities;
namespace HrynCo.NotificationService.DAL.EF.Entities;
HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj
+1
View File
@@ -5,6 +5,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HrynCo.DAL.EF" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs
+2 -2
View File
@@ -1,13 +1,13 @@
using System.Text.Json;
using HrynCo.NotificationService.DAL.Abstract.Providers;
using HrynCo.NotificationService.DAL.Abstract.Repositories;
using HrynCo.NotificationService.DAL.EF.Core;
using HrynCo.DAL.EF.Core;
using HrynCo.NotificationService.DAL.EF.Entities;
using Microsoft.EntityFrameworkCore;
namespace HrynCo.NotificationService.DAL.EF.Repositories;
internal sealed class EmailChannelRepository : EfRepository<EmailChannelEntity>, IEmailChannelRepository
internal sealed class EmailChannelRepository : EfRepository<NotificationDbContext, EmailChannelEntity>, IEmailChannelRepository
{
public EmailChannelRepository(NotificationDbContext dbContext) : base(dbContext)
{
HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs
+2 -2
View File
@@ -1,11 +1,11 @@
using HrynCo.NotificationService.DAL.Abstract.Repositories;
using HrynCo.NotificationService.DAL.EF.Core;
using HrynCo.DAL.EF.Core;
using HrynCo.NotificationService.DAL.EF.Entities;
using Microsoft.EntityFrameworkCore;
namespace HrynCo.NotificationService.DAL.EF.Repositories;
internal sealed class EmailChannelUsageRepository : EfRepository<EmailChannelUsageEntity>, IEmailChannelUsageRepository
internal sealed class EmailChannelUsageRepository : EfRepository<NotificationDbContext, EmailChannelUsageEntity>, IEmailChannelUsageRepository
{
public EmailChannelUsageRepository(NotificationDbContext dbContext) : base(dbContext)
{
HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs
+2 -2
View File
@@ -1,12 +1,12 @@
using HrynCo.NotificationService.DAL.Abstract.Repositories;
using HrynCo.NotificationService.DAL.Abstract.Templates;
using HrynCo.NotificationService.DAL.EF.Core;
using HrynCo.DAL.EF.Core;
using HrynCo.NotificationService.DAL.EF.Entities;
using Microsoft.EntityFrameworkCore;
namespace HrynCo.NotificationService.DAL.EF.Repositories;
internal sealed class EmailTemplateRepository : EfRepository<EmailTemplateEntity>, IEmailTemplateRepository
internal sealed class EmailTemplateRepository : EfRepository<NotificationDbContext, EmailTemplateEntity>, IEmailTemplateRepository
{
public EmailTemplateRepository(NotificationDbContext dbContext) : base(dbContext)
{
HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using HrynCo.NotificationService.DAL.Abstract;
using HrynCo.DAL.Abstract;
using HrynCo.NotificationService.DAL.Abstract.Repositories;
using HrynCo.NotificationService.DAL.EF.Core;
using HrynCo.NotificationService.DAL.EF.Repositories;