fix: inherit EF entities from Entity base class
- TemplateEntity, ProviderEntity, ProviderUsageEntity now inherit Entity (from DAL.Abstract) - Removes duplicated Id, Created, Updated properties from each entity Ref: IT-628 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -12,12 +12,18 @@ internal sealed class EfTransactionAdapter : ITransaction
|
|||||||
_transaction = transaction;
|
_transaction = transaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task CommitAsync(CancellationToken cancellationToken = default) =>
|
public Task CommitAsync(CancellationToken cancellationToken = default)
|
||||||
_transaction.CommitAsync(cancellationToken);
|
{
|
||||||
|
return _transaction.CommitAsync(cancellationToken);
|
||||||
public Task RollbackAsync(CancellationToken cancellationToken = default) =>
|
}
|
||||||
_transaction.RollbackAsync(cancellationToken);
|
|
||||||
|
public Task RollbackAsync(CancellationToken cancellationToken = default)
|
||||||
public ValueTask DisposeAsync() =>
|
{
|
||||||
_transaction.DisposeAsync();
|
return _transaction.RollbackAsync(cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
return _transaction.DisposeAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -18,14 +18,19 @@ internal abstract class EfUnitOfWork<TDbContext> : IUnitOfWork
|
|||||||
public async Task<ITransaction> BeginTransactionAsync(CancellationToken cancellationToken = default)
|
public async Task<ITransaction> BeginTransactionAsync(CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
if (_currentTransaction != null)
|
if (_currentTransaction != null)
|
||||||
|
{
|
||||||
return _currentTransaction;
|
return _currentTransaction;
|
||||||
|
}
|
||||||
|
|
||||||
IDbContextTransaction tx = await _context.Database.BeginTransactionAsync(cancellationToken);
|
IDbContextTransaction tx = await _context.Database.BeginTransactionAsync(cancellationToken);
|
||||||
_currentTransaction = new EfTransactionAdapter(tx);
|
_currentTransaction = new EfTransactionAdapter(tx);
|
||||||
return _currentTransaction;
|
return _currentTransaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ITransaction? GetCurrentTransaction() => _currentTransaction;
|
public ITransaction? GetCurrentTransaction()
|
||||||
|
{
|
||||||
|
return _currentTransaction;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task ExecuteInTransactionAsync(Func<Task> action)
|
public async Task ExecuteInTransactionAsync(Func<Task> action)
|
||||||
{
|
{
|
||||||
@@ -36,16 +41,26 @@ internal abstract class EfUnitOfWork<TDbContext> : IUnitOfWork
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
await action();
|
await action();
|
||||||
if (ownsTransaction) await tx.CommitAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.CommitAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
if (ownsTransaction) await tx.RollbackAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.RollbackAsync();
|
||||||
|
}
|
||||||
|
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
if (ownsTransaction) await tx.DisposeAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.DisposeAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,17 +73,28 @@ internal abstract class EfUnitOfWork<TDbContext> : IUnitOfWork
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
TResult result = await action();
|
TResult result = await action();
|
||||||
if (ownsTransaction) await tx.CommitAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.CommitAsync();
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
if (ownsTransaction) await tx.RollbackAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.RollbackAsync();
|
||||||
|
}
|
||||||
|
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
if (ownsTransaction) await tx.DisposeAsync();
|
if (ownsTransaction)
|
||||||
|
{
|
||||||
|
await tx.DisposeAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -45,9 +45,13 @@ internal abstract class NotificationEfRepository<TEntity>
|
|||||||
await DbContext.SaveChangesAsync(ct);
|
await DbContext.SaveChangesAsync(ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Task<bool> ExistsAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken ct = default) =>
|
protected Task<bool> ExistsAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken ct = default)
|
||||||
DbSet.AnyAsync(predicate, ct);
|
{
|
||||||
|
return DbSet.AnyAsync(predicate, ct);
|
||||||
protected Task SaveAsync(CancellationToken ct = default) =>
|
}
|
||||||
DbContext.SaveChangesAsync(ct);
|
|
||||||
|
protected Task SaveAsync(CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
return DbContext.SaveChangesAsync(ct);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
|
using HrynCo.NotificationService.DAL.Abstract.Entities;
|
||||||
using HrynCo.NotificationService.DAL.Abstract.Providers;
|
using HrynCo.NotificationService.DAL.Abstract.Providers;
|
||||||
|
|
||||||
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
||||||
|
|
||||||
internal class ProviderEntity
|
internal class ProviderEntity : Entity
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
|
||||||
public required string ServiceName { get; set; }
|
public required string ServiceName { get; set; }
|
||||||
public int Priority { get; set; }
|
public int Priority { get; set; }
|
||||||
public ProviderType ProviderType { get; set; }
|
public ProviderType ProviderType { get; set; }
|
||||||
@@ -19,6 +19,4 @@ internal class ProviderEntity
|
|||||||
public int? MonthlyLimit { get; set; }
|
public int? MonthlyLimit { get; set; }
|
||||||
public int WarnThresholdPercent { get; set; }
|
public int WarnThresholdPercent { get; set; }
|
||||||
public bool IsActive { get; set; }
|
public bool IsActive { get; set; }
|
||||||
public DateTimeOffset Created { get; set; }
|
|
||||||
public DateTimeOffset? Updated { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
|
using HrynCo.NotificationService.DAL.Abstract.Entities;
|
||||||
|
|
||||||
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
||||||
|
|
||||||
internal class ProviderUsageEntity
|
internal class ProviderUsageEntity : Entity
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
|
||||||
public Guid ProviderId { get; set; }
|
public Guid ProviderId { get; set; }
|
||||||
public DateOnly Date { get; set; }
|
public DateOnly Date { get; set; }
|
||||||
public int SentCount { get; set; }
|
public int SentCount { get; set; }
|
||||||
public DateTimeOffset Created { get; set; }
|
|
||||||
public DateTimeOffset? Updated { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
|
using HrynCo.NotificationService.DAL.Abstract.Entities;
|
||||||
|
|
||||||
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
namespace HrynCo.NotificationService.DAL.EF.Entities;
|
||||||
|
|
||||||
internal class TemplateEntity
|
internal class TemplateEntity : Entity
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
|
||||||
public required string ServiceName { get; set; }
|
public required string ServiceName { get; set; }
|
||||||
public required string Key { get; set; }
|
public required string Key { get; set; }
|
||||||
public required string LanguageCode { get; set; }
|
public required string LanguageCode { get; set; }
|
||||||
@@ -10,8 +11,6 @@ internal class TemplateEntity
|
|||||||
public required string HtmlBody { get; set; }
|
public required string HtmlBody { get; set; }
|
||||||
public required string TextBody { get; set; }
|
public required string TextBody { get; set; }
|
||||||
public List<TemplateVariableData> Variables { get; set; } = [];
|
public List<TemplateVariableData> Variables { get; set; } = [];
|
||||||
public DateTimeOffset Created { get; set; }
|
|
||||||
public DateTimeOffset? Updated { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class TemplateVariableData
|
internal class TemplateVariableData
|
||||||
|
|||||||
Reference in New Issue
Block a user