From 2a98fe3fdccf4c2f73815431e3ff2777ec6ae7fa Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 23 Aug 2020 10:25:44 -0500 Subject: [PATCH] =?UTF-8?q?refactor(directory):=20=E2=99=BB=20ren=20QueryC?= =?UTF-8?q?ontext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- directory/src/FilterLists.Directory.Application/GetLists.cs | 6 +++--- .../{Facade/IQueryDirectory.cs => Context/IQueryContext.cs} | 4 ++-- .../{Facade/QueryFacade.cs => Context/QueryContext.cs} | 6 +++--- .../Queries/{Facade => Context}/QueryDbContext.cs | 2 +- .../ServiceRegistrationExtension.cs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) rename directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/{Facade/IQueryDirectory.cs => Context/IQueryContext.cs} (91%) rename directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/{Facade/QueryFacade.cs => Context/QueryContext.cs} (89%) rename directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/{Facade => Context}/QueryDbContext.cs (99%) diff --git a/directory/src/FilterLists.Directory.Application/GetLists.cs b/directory/src/FilterLists.Directory.Application/GetLists.cs index ccfb07dfe..ba39c1a34 100644 --- a/directory/src/FilterLists.Directory.Application/GetLists.cs +++ b/directory/src/FilterLists.Directory.Application/GetLists.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -using FilterLists.Directory.Infrastructure.Persistence.Queries.Facade; using MediatR; using Microsoft.EntityFrameworkCore; @@ -16,9 +16,9 @@ public class Query : IRequest> public class Handler : IRequestHandler> { - private readonly IQueryDirectory _context; + private readonly IQueryContext _context; - public Handler(IQueryDirectory context) + public Handler(IQueryContext context) { _context = context; } diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs similarity index 91% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs index 3b9fa1521..4ef16c9a4 100644 --- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/IQueryDirectory.cs +++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs @@ -1,9 +1,9 @@ using System.Linq; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade +namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Context { - public interface IQueryDirectory + public interface IQueryContext { IQueryable FilterLists { get; } IQueryable Languages { get; } diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs similarity index 89% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs index 33c191166..0b6681633 100644 --- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs +++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs @@ -4,13 +4,13 @@ using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade +namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Context { - internal class QueryFacade : IQueryDirectory, IAsyncDisposable + internal class QueryContext : IQueryContext, IAsyncDisposable { private readonly QueryDbContext _dbContext; - public QueryFacade(QueryDbContext dbContext) + public QueryContext(QueryDbContext dbContext) { _dbContext = dbContext; } diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs similarity index 99% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs index ef38cf948..15812b25b 100644 --- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs +++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs @@ -4,7 +4,7 @@ using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade +namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Context { internal class QueryDbContext : DbContext { diff --git a/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs b/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs index ceaca2c99..2712980de 100644 --- a/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs +++ b/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs @@ -1,4 +1,4 @@ -using FilterLists.Directory.Infrastructure.Persistence.Queries.Facade; +using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +11,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I { services.AddDbContextPool(o => o.UseNpgsql(configuration.GetConnectionString("DirectoryConnection"))); - services.AddScoped(); + services.AddScoped(); } } } \ No newline at end of file