diff --git a/FreelancerBlog/FreelancerBlog.Core/Queries/Data/Articles/GetAriclesQuery.cs b/FreelancerBlog/FreelancerBlog.Core/Queries/Data/Articles/GetAriclesQuery.cs index 170b0a7..fa76b0b 100644 --- a/FreelancerBlog/FreelancerBlog.Core/Queries/Data/Articles/GetAriclesQuery.cs +++ b/FreelancerBlog/FreelancerBlog.Core/Queries/Data/Articles/GetAriclesQuery.cs @@ -4,5 +4,5 @@ namespace FreelancerBlog.Core.Queries.Data.Articles { - public class GetAriclesQuery : IRequest>{ } + public class GetArticlesQuery : IRequest>{ } } \ No newline at end of file diff --git a/FreelancerBlog/FreelancerBlog.Data/Queries/Articles/GetAriclesQueryHandler.cs b/FreelancerBlog/FreelancerBlog.Data/Queries/Articles/GetAriclesQueryHandler.cs index 822e15b..60ed209 100644 --- a/FreelancerBlog/FreelancerBlog.Data/Queries/Articles/GetAriclesQueryHandler.cs +++ b/FreelancerBlog/FreelancerBlog.Data/Queries/Articles/GetAriclesQueryHandler.cs @@ -11,7 +11,7 @@ namespace FreelancerBlog.Data.Queries.Articles { - public class GetAriclesQueryHandler : RequestHandler> + public class GetAriclesQueryHandler : RequestHandler> { private FreelancerBlogContext _context; @@ -20,7 +20,7 @@ public GetAriclesQueryHandler(FreelancerBlogContext context) _context = context; } - protected override IQueryable
Handle(GetAriclesQuery message) + protected override IQueryable
Handle(GetArticlesQuery message) { return _context.Articles.Include(a => a.ApplicationUser).Include(a => a.ArticleRatings).Include(a => a.ArticleComments); } diff --git a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj index b6b37a2..f88c9ae 100644 --- a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj +++ b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj @@ -11,9 +11,9 @@ all runtime; build; native; contentfiles; analyzers - - - + + + diff --git a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj index 29372e4..c0dc276 100644 --- a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj +++ b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj @@ -5,9 +5,8 @@ - - - + + diff --git a/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Admin/ArticleControllerTests.cs b/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Admin/ArticleControllerTests.cs index cff3bdf..fcb87b2 100644 --- a/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Admin/ArticleControllerTests.cs +++ b/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Admin/ArticleControllerTests.cs @@ -40,7 +40,7 @@ public async Task GetArticleTableData_Should_ReturnTheCorrectType() { var articles = new List
{ new Article(), new Article(), new Article() }.AsQueryable(); - A.CallTo(() => _mediator.Send(A._, A._)).Returns(articles); + A.CallTo(() => _mediator.Send(A._, A._)).Returns(articles); var result = await _sut.GetArticleTableData(new DataTablesParam()); diff --git a/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Root/ArticleControllerTests.cs b/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Root/ArticleControllerTests.cs index 4cf21ca..2c8bb73 100644 --- a/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Root/ArticleControllerTests.cs +++ b/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Root/ArticleControllerTests.cs @@ -42,7 +42,7 @@ public async Task Index_Always_PassesTheCorrectArticlesToMapMethod() { var articles = new[] { new Article { ArticleId = 1 } }.AsQueryable(); - A.CallTo(() => _mediatorFake.Send(A.Ignored, A.Ignored)).Returns(articles); + A.CallTo(() => _mediatorFake.Send(A.Ignored, A.Ignored)).Returns(articles); await _sut.Index(); diff --git a/FreelancerBlog/FreelancerBlog/Areas/Admin/Controllers/ArticleController.cs b/FreelancerBlog/FreelancerBlog/Areas/Admin/Controllers/ArticleController.cs index 60aff76..9ce88cf 100644 --- a/FreelancerBlog/FreelancerBlog/Areas/Admin/Controllers/ArticleController.cs +++ b/FreelancerBlog/FreelancerBlog/Areas/Admin/Controllers/ArticleController.cs @@ -41,7 +41,7 @@ public ArticleController(IFileManager fileManager, IMapper mapper, IMediator med [HttpGet] public async Task> GetArticleTableData(DataTablesParam dataTableParam) { - var articles = await _mediator.Send(new GetAriclesQuery()); + var articles = await _mediator.Send(new GetArticlesQuery()); var articleViewModels = articles.Select(a => new ArticleViewModel { diff --git a/FreelancerBlog/FreelancerBlog/Controllers/ArticleController.cs b/FreelancerBlog/FreelancerBlog/Controllers/ArticleController.cs index e74df7c..a31a249 100644 --- a/FreelancerBlog/FreelancerBlog/Controllers/ArticleController.cs +++ b/FreelancerBlog/FreelancerBlog/Controllers/ArticleController.cs @@ -30,7 +30,7 @@ public ArticleController(IMapper mapper, IMediator mediator) [HttpGet] public async Task Index() { - var articles = await _mediator.Send(new GetAriclesQuery()); + var articles = await _mediator.Send(new GetArticlesQuery()); var articlesViewModel = _mapper.Map, List>(articles); diff --git a/FreelancerBlog/FreelancerBlog/Startup.cs b/FreelancerBlog/FreelancerBlog/Startup.cs index 9a06b59..44d967c 100644 --- a/FreelancerBlog/FreelancerBlog/Startup.cs +++ b/FreelancerBlog/FreelancerBlog/Startup.cs @@ -99,7 +99,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvcJQueryDataTables(); - services.AddAutoMapper(typeof(Startup)); + services.AddAutoMapper(); services.AddMemoryCache(); @@ -114,7 +114,8 @@ public void ConfigureServices(IServiceCollection services) { o.LoginPath = new PathString("/Account/Login/"); o.AccessDeniedPath = new PathString("/Account/Forbidden/"); - }).AddFacebook(o => + }) + .AddFacebook(o => { o.AppId = Configuration["OAuth:Facebook:AppId"]; o.AppSecret = Configuration["OAuth:Facebook:AppSecret"]; @@ -123,7 +124,8 @@ public void ConfigureServices(IServiceCollection services) //Scope.Add("email"), o.BackchannelHttpHandler = new FacebookBackChannelHandler(); o.UserInformationEndpoint = "https://graph.facebook.com/v2.4/me?fields=id,name,email,first_name,last_name,location"; - }).AddGoogle(o => + }) + .AddGoogle(o => { o.ClientId = Configuration["OAuth:Google:ClientId"]; o.ClientSecret = Configuration["OAuth:Google:ClientSecret"]; @@ -137,12 +139,14 @@ public void ConfigureServices(IServiceCollection services) return Task.FromResult(0); } }; - }).AddMicrosoftAccount(MicrosoftAccountDefaults.AuthenticationScheme, "FreelancerBlog Microsoft OAuth", o => + }) + .AddMicrosoftAccount(MicrosoftAccountDefaults.AuthenticationScheme, "FreelancerBlog Microsoft OAuth", o => { o.ClientId = Configuration["OAuth:Microsoft:ClientId"]; o.ClientSecret = Configuration["OAuth:Microsoft:ClientSecret"]; //Scope.Add("wl.emails, wl.basic"), - }).AddTwitter(TwitterDefaults.AuthenticationScheme, "FreelancerBlog Twitter Auth", o => + }) + .AddTwitter(TwitterDefaults.AuthenticationScheme, "FreelancerBlog Twitter Auth", o => { o.ConsumerKey = Configuration["OAuth:Twitter:ConsumerKey"]; o.ConsumerSecret = Configuration["OAuth:Twitter:ConsumerSecret"];