From ee4c988a0dbcbaa06c8d69cc286793d22c0c9e79 Mon Sep 17 00:00:00 2001 From: Anatolii Grynchuk Date: Tue, 5 May 2026 20:39:06 +0300 Subject: [PATCH] refactor: replace local dal abstractions with hrynco-ef packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Directory.Packages.props | 2 + .../Entities/Entity.cs | 17 --- .../Entities/IEntity.cs | 8 -- ...Co.NotificationService.DAL.Abstract.csproj | 4 + .../ITransaction.cs | 7 -- .../IUnitOfWork.cs | 11 -- .../Providers/EmailChannel.cs | 2 +- .../Providers/EmailChannelUsage.cs | 2 +- .../Templates/EmailTemplate.cs | 2 +- .../Core/EfRepository.cs | 45 -------- .../Core/EfTransactionAdapter.cs | 29 ----- .../Core/EfUnitOfWork.cs | 105 ------------------ .../Core/UnitOfWork.cs | 2 + .../Entities/EmailChannelEntity.cs | 2 +- .../Entities/EmailChannelUsageEntity.cs | 2 +- .../Entities/EmailTemplateEntity.cs | 2 +- .../HrynCo.NotificationService.DAL.EF.csproj | 1 + .../Repositories/EmailChannelRepository.cs | 4 +- .../EmailChannelUsageRepository.cs | 4 +- .../Repositories/EmailTemplateRepository.cs | 4 +- .../ServiceCollectionExtensions.cs | 2 +- .../Behaviors/TransactionBehavior.cs | 2 +- .../Core/RequestHandler.cs | 2 +- .../Create/CreateEmailChannelHandler.cs | 2 +- .../Delete/DeleteEmailChannelHandler.cs | 2 +- .../Get/GetEmailChannelHandler.cs | 2 +- .../GetAll/GetAllEmailChannelsHandler.cs | 2 +- .../GetByService/GetEmailChannelsHandler.cs | 2 +- .../GetChannelUsageSummaryHandler.cs | 2 +- .../EmailChannels/Send/SendEmailHandler.cs | 2 +- .../EmailChannels/TestSmtp/TestSmtpHandler.cs | 2 +- .../Update/UpdateEmailChannelHandler.cs | 2 +- .../Create/CreateEmailTemplateHandler.cs | 2 +- .../Delete/DeleteEmailTemplateHandler.cs | 2 +- .../Get/GetEmailTemplateHandler.cs | 2 +- .../GetAll/GetAllEmailTemplatesHandler.cs | 2 +- .../GetByService/GetEmailTemplatesHandler.cs | 2 +- .../Update/UpdateEmailTemplateHandler.cs | 2 +- 38 files changed, 39 insertions(+), 252 deletions(-) delete mode 100644 HrynCo.NotificationService.DAL.Abstract/Entities/Entity.cs delete mode 100644 HrynCo.NotificationService.DAL.Abstract/Entities/IEntity.cs delete mode 100644 HrynCo.NotificationService.DAL.Abstract/ITransaction.cs delete mode 100644 HrynCo.NotificationService.DAL.Abstract/IUnitOfWork.cs delete mode 100644 HrynCo.NotificationService.DAL.EF/Core/EfRepository.cs delete mode 100644 HrynCo.NotificationService.DAL.EF/Core/EfTransactionAdapter.cs delete mode 100644 HrynCo.NotificationService.DAL.EF/Core/EfUnitOfWork.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index fce03e0..a3174ae 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -29,6 +29,8 @@ + + diff --git a/HrynCo.NotificationService.DAL.Abstract/Entities/Entity.cs b/HrynCo.NotificationService.DAL.Abstract/Entities/Entity.cs deleted file mode 100644 index fcec809..0000000 --- a/HrynCo.NotificationService.DAL.Abstract/Entities/Entity.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace HrynCo.NotificationService.DAL.Abstract.Entities; - -public abstract class Entity : IEntity where TId : struct -{ - public TId Id { get; set; } - public DateTimeOffset Created { get; set; } - public DateTimeOffset? Updated { get; set; } -} - -public abstract class Entity : Entity -{ - protected Entity() - { - Id = Guid.NewGuid(); - Created = DateTimeOffset.UtcNow; - } -} diff --git a/HrynCo.NotificationService.DAL.Abstract/Entities/IEntity.cs b/HrynCo.NotificationService.DAL.Abstract/Entities/IEntity.cs deleted file mode 100644 index a1445ab..0000000 --- a/HrynCo.NotificationService.DAL.Abstract/Entities/IEntity.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace HrynCo.NotificationService.DAL.Abstract.Entities; - -public interface IEntity where TId : struct -{ - TId Id { get; set; } - DateTimeOffset Created { get; set; } - DateTimeOffset? Updated { get; set; } -} diff --git a/HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj b/HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj index b760144..0e19145 100644 --- a/HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj +++ b/HrynCo.NotificationService.DAL.Abstract/HrynCo.NotificationService.DAL.Abstract.csproj @@ -1,5 +1,9 @@  + + + + net10.0 enable diff --git a/HrynCo.NotificationService.DAL.Abstract/ITransaction.cs b/HrynCo.NotificationService.DAL.Abstract/ITransaction.cs deleted file mode 100644 index 9e75639..0000000 --- a/HrynCo.NotificationService.DAL.Abstract/ITransaction.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace HrynCo.NotificationService.DAL.Abstract; - -public interface ITransaction : IAsyncDisposable -{ - Task CommitAsync(CancellationToken cancellationToken = default); - Task RollbackAsync(CancellationToken cancellationToken = default); -} diff --git a/HrynCo.NotificationService.DAL.Abstract/IUnitOfWork.cs b/HrynCo.NotificationService.DAL.Abstract/IUnitOfWork.cs deleted file mode 100644 index 3e1bf64..0000000 --- a/HrynCo.NotificationService.DAL.Abstract/IUnitOfWork.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace HrynCo.NotificationService.DAL.Abstract; - -public interface IUnitOfWork -{ - Task SaveChangesAsync(CancellationToken cancellationToken = default); - Task BeginTransactionAsync(CancellationToken cancellationToken = default); - ITransaction? GetCurrentTransaction(); - - Task ExecuteInTransactionAsync(Func action); - Task ExecuteInTransactionAsync(Func> action); -} diff --git a/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannel.cs b/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannel.cs index b288734..3021251 100644 --- a/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannel.cs +++ b/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannel.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract.Entities; +using HrynCo.DAL.Abstract.Entities; namespace HrynCo.NotificationService.DAL.Abstract.Providers; diff --git a/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannelUsage.cs b/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannelUsage.cs index 336f284..18ac01f 100644 --- a/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannelUsage.cs +++ b/HrynCo.NotificationService.DAL.Abstract/Providers/EmailChannelUsage.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract.Entities; +using HrynCo.DAL.Abstract.Entities; namespace HrynCo.NotificationService.DAL.Abstract.Providers; diff --git a/HrynCo.NotificationService.DAL.Abstract/Templates/EmailTemplate.cs b/HrynCo.NotificationService.DAL.Abstract/Templates/EmailTemplate.cs index d436382..eafb069 100644 --- a/HrynCo.NotificationService.DAL.Abstract/Templates/EmailTemplate.cs +++ b/HrynCo.NotificationService.DAL.Abstract/Templates/EmailTemplate.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract.Entities; +using HrynCo.DAL.Abstract.Entities; namespace HrynCo.NotificationService.DAL.Abstract.Templates; diff --git a/HrynCo.NotificationService.DAL.EF/Core/EfRepository.cs b/HrynCo.NotificationService.DAL.EF/Core/EfRepository.cs deleted file mode 100644 index 2cd5661..0000000 --- a/HrynCo.NotificationService.DAL.EF/Core/EfRepository.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Linq.Expressions; -using Microsoft.EntityFrameworkCore; - -namespace HrynCo.NotificationService.DAL.EF.Core; - -internal abstract class EfRepository - where TEntity : class -{ - protected NotificationDbContext DbContext { get; } - protected DbSet DbSet { get; } - - protected EfRepository(NotificationDbContext dbContext) - { - DbContext = dbContext; - DbSet = dbContext.Set(); - } - - protected async Task AddAsync(TEntity entity, CancellationToken ct = default) - { - await DbSet.AddAsync(entity, ct); - } - - protected async Task AddRangeAsync(IEnumerable 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 entities) - { - DbSet.RemoveRange(entities); - } - - protected Task ExistsAsync(Expression> predicate, CancellationToken ct = default) => - DbSet.AnyAsync(predicate, ct); -} \ No newline at end of file diff --git a/HrynCo.NotificationService.DAL.EF/Core/EfTransactionAdapter.cs b/HrynCo.NotificationService.DAL.EF/Core/EfTransactionAdapter.cs deleted file mode 100644 index e5855af..0000000 --- a/HrynCo.NotificationService.DAL.EF/Core/EfTransactionAdapter.cs +++ /dev/null @@ -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(); - } -} \ No newline at end of file diff --git a/HrynCo.NotificationService.DAL.EF/Core/EfUnitOfWork.cs b/HrynCo.NotificationService.DAL.EF/Core/EfUnitOfWork.cs deleted file mode 100644 index 0d45441..0000000 --- a/HrynCo.NotificationService.DAL.EF/Core/EfUnitOfWork.cs +++ /dev/null @@ -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 : 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 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 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 ExecuteInTransactionAsync(Func> 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(); - } - } - } -} \ No newline at end of file diff --git a/HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs b/HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs index 7e8ebfa..f6a557a 100644 --- a/HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs +++ b/HrynCo.NotificationService.DAL.EF/Core/UnitOfWork.cs @@ -1,3 +1,5 @@ +using HrynCo.DAL.EF.Core; + namespace HrynCo.NotificationService.DAL.EF.Core; internal sealed class UnitOfWork : EfUnitOfWork diff --git a/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs b/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs index 4db02b4..7b95486 100644 --- a/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs +++ b/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelEntity.cs @@ -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; diff --git a/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs b/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs index 71fe531..fbba7e6 100644 --- a/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs +++ b/HrynCo.NotificationService.DAL.EF/Entities/EmailChannelUsageEntity.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract.Entities; +using HrynCo.DAL.Abstract.Entities; namespace HrynCo.NotificationService.DAL.EF.Entities; diff --git a/HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs b/HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs index f22f3d6..a68f0c5 100644 --- a/HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs +++ b/HrynCo.NotificationService.DAL.EF/Entities/EmailTemplateEntity.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract.Entities; +using HrynCo.DAL.Abstract.Entities; namespace HrynCo.NotificationService.DAL.EF.Entities; diff --git a/HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj b/HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj index f073f56..5b7530d 100644 --- a/HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj +++ b/HrynCo.NotificationService.DAL.EF/HrynCo.NotificationService.DAL.EF.csproj @@ -5,6 +5,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs index 81f2210..c7cbf3a 100644 --- a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs +++ b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelRepository.cs @@ -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, IEmailChannelRepository +internal sealed class EmailChannelRepository : EfRepository, IEmailChannelRepository { public EmailChannelRepository(NotificationDbContext dbContext) : base(dbContext) { diff --git a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs index 0a79344..62ab9a5 100644 --- a/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs +++ b/HrynCo.NotificationService.DAL.EF/Repositories/EmailChannelUsageRepository.cs @@ -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, IEmailChannelUsageRepository +internal sealed class EmailChannelUsageRepository : EfRepository, IEmailChannelUsageRepository { public EmailChannelUsageRepository(NotificationDbContext dbContext) : base(dbContext) { diff --git a/HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs b/HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs index e3960a8..fc6c6ec 100644 --- a/HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs +++ b/HrynCo.NotificationService.DAL.EF/Repositories/EmailTemplateRepository.cs @@ -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, IEmailTemplateRepository +internal sealed class EmailTemplateRepository : EfRepository, IEmailTemplateRepository { public EmailTemplateRepository(NotificationDbContext dbContext) : base(dbContext) { diff --git a/HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs b/HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs index 16edbb7..10a9a7d 100644 --- a/HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs +++ b/HrynCo.NotificationService.DAL.EF/ServiceCollectionExtensions.cs @@ -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; diff --git a/HrynCo.NotificationService.Services/Behaviors/TransactionBehavior.cs b/HrynCo.NotificationService.Services/Behaviors/TransactionBehavior.cs index db7592a..1939570 100644 --- a/HrynCo.NotificationService.Services/Behaviors/TransactionBehavior.cs +++ b/HrynCo.NotificationService.Services/Behaviors/TransactionBehavior.cs @@ -1,5 +1,5 @@ using HrynCo.Common; -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using MediatR; namespace HrynCo.NotificationService.Services.Behaviors; diff --git a/HrynCo.NotificationService.Services/Core/RequestHandler.cs b/HrynCo.NotificationService.Services/Core/RequestHandler.cs index b40264e..7fb281d 100644 --- a/HrynCo.NotificationService.Services/Core/RequestHandler.cs +++ b/HrynCo.NotificationService.Services/Core/RequestHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.Services.Logging; using MediatR; using Serilog; diff --git a/HrynCo.NotificationService.Services/EmailChannels/Create/CreateEmailChannelHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/Create/CreateEmailChannelHandler.cs index 7538abe..d3d584b 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/Create/CreateEmailChannelHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/Create/CreateEmailChannelHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Providers; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailChannels/Delete/DeleteEmailChannelHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/Delete/DeleteEmailChannelHandler.cs index 9d126cd..785af9f 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/Delete/DeleteEmailChannelHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/Delete/DeleteEmailChannelHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging; diff --git a/HrynCo.NotificationService.Services/EmailChannels/Get/GetEmailChannelHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/Get/GetEmailChannelHandler.cs index a85d45d..6276aa6 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/Get/GetEmailChannelHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/Get/GetEmailChannelHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Providers; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailChannels/GetAll/GetAllEmailChannelsHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/GetAll/GetAllEmailChannelsHandler.cs index 91299ef..65fa009 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/GetAll/GetAllEmailChannelsHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/GetAll/GetAllEmailChannelsHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Providers; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailChannels/GetByService/GetEmailChannelsHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/GetByService/GetEmailChannelsHandler.cs index b8af894..74b0870 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/GetByService/GetEmailChannelsHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/GetByService/GetEmailChannelsHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Providers; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailChannels/GetUsageSummary/GetChannelUsageSummaryHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/GetUsageSummary/GetChannelUsageSummaryHandler.cs index e9dc616..95f19f9 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/GetUsageSummary/GetChannelUsageSummaryHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/GetUsageSummary/GetChannelUsageSummaryHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging; diff --git a/HrynCo.NotificationService.Services/EmailChannels/Send/SendEmailHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/Send/SendEmailHandler.cs index 8b6020b..e79ff1e 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/Send/SendEmailHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/Send/SendEmailHandler.cs @@ -1,6 +1,6 @@ using System.Net; using System.Net.Mail; -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Providers; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailChannels/TestSmtp/TestSmtpHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/TestSmtp/TestSmtpHandler.cs index 3060906..ba03b3d 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/TestSmtp/TestSmtpHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/TestSmtp/TestSmtpHandler.cs @@ -1,6 +1,6 @@ using System.Net; using System.Net.Mail; -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging; using static HrynCo.NotificationService.Services.Core.ServiceResultHelper; diff --git a/HrynCo.NotificationService.Services/EmailChannels/Update/UpdateEmailChannelHandler.cs b/HrynCo.NotificationService.Services/EmailChannels/Update/UpdateEmailChannelHandler.cs index 5c8f1ed..fdd654f 100644 --- a/HrynCo.NotificationService.Services/EmailChannels/Update/UpdateEmailChannelHandler.cs +++ b/HrynCo.NotificationService.Services/EmailChannels/Update/UpdateEmailChannelHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/Create/CreateEmailTemplateHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/Create/CreateEmailTemplateHandler.cs index 33c44e0..269b4d6 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/Create/CreateEmailTemplateHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/Create/CreateEmailTemplateHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.DAL.Abstract.Templates; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/Delete/DeleteEmailTemplateHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/Delete/DeleteEmailTemplateHandler.cs index 4e924c0..da4e960 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/Delete/DeleteEmailTemplateHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/Delete/DeleteEmailTemplateHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/Get/GetEmailTemplateHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/Get/GetEmailTemplateHandler.cs index 24b1f75..e685672 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/Get/GetEmailTemplateHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/Get/GetEmailTemplateHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.DAL.Abstract.Templates; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/GetAll/GetAllEmailTemplatesHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/GetAll/GetAllEmailTemplatesHandler.cs index 3ee21d2..5a87f86 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/GetAll/GetAllEmailTemplatesHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/GetAll/GetAllEmailTemplatesHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.DAL.Abstract.Templates; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/GetByService/GetEmailTemplatesHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/GetByService/GetEmailTemplatesHandler.cs index 7fb5fc0..979da8d 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/GetByService/GetEmailTemplatesHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/GetByService/GetEmailTemplatesHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.DAL.Abstract.Templates; using HrynCo.NotificationService.Services.Core; diff --git a/HrynCo.NotificationService.Services/EmailTemplates/Update/UpdateEmailTemplateHandler.cs b/HrynCo.NotificationService.Services/EmailTemplates/Update/UpdateEmailTemplateHandler.cs index 597e200..a9d101a 100644 --- a/HrynCo.NotificationService.Services/EmailTemplates/Update/UpdateEmailTemplateHandler.cs +++ b/HrynCo.NotificationService.Services/EmailTemplates/Update/UpdateEmailTemplateHandler.cs @@ -1,4 +1,4 @@ -using HrynCo.NotificationService.DAL.Abstract; +using HrynCo.DAL.Abstract; using HrynCo.NotificationService.DAL.Abstract.Repositories; using HrynCo.NotificationService.Services.Core; using HrynCo.NotificationService.Services.Logging;