From 844b73a67a64e2d1317f6d279b997af3d7bcb7fc Mon Sep 17 00:00:00 2001 From: Hamid Mosalla Date: Tue, 27 Aug 2019 08:23:02 +0200 Subject: [PATCH 1/5] Update nuget package --- .../Wrappers/IConfigurationBinderWrapper.cs | 11 +++++++++++ .../Commands/Wrappers/IDirectoryWrapper.cs | 10 ++++++++++ .../Commands/Wrappers/IFileSystemWrapper.cs | 9 +++++++++ .../Commands/Wrappers/IFileWrapper.cs | 13 +++++++++++++ .../Commands/Wrappers/ILoggerWrapper.cs | 11 +++++++++++ .../Commands/Wrappers/IPathWrapper.cs | 9 +++++++++ .../FreelancerBlog.Data/FreelancerBlog.Data.csproj | 8 ++++---- .../FreelancerBlog.Infrastructure.csproj | 2 +- .../FreelancerBlog.IntegrationTests.csproj | 4 ++-- .../FreelancerBlog.Services.csproj | 2 +- .../FreelancerBlog.UITests.csproj | 4 ++-- .../FreelancerBlog.UnitTests.csproj | 6 +++--- FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj | 10 +++++----- FreelancerBlog/FreelancerBlog/Startup.cs | 2 +- 14 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs create mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs new file mode 100644 index 0000000..30fbc1e --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs @@ -0,0 +1,11 @@ +using Microsoft.Extensions.Configuration; + +namespace FreelancerBlog.Core.Wrappers +{ + public interface IConfigurationBinderWrapper + { + IConfiguration Configuration { get; } + + T GetValue(string key); + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs new file mode 100644 index 0000000..195c680 --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs @@ -0,0 +1,10 @@ +using System.IO; + +namespace FreelancerBlog.Core.Wrappers +{ + public interface IDirectoryWrapper + { + bool Exists(string path); + DirectoryInfo CreateDirectory(string path); + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs new file mode 100644 index 0000000..a23df08 --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs @@ -0,0 +1,9 @@ +namespace FreelancerBlog.Core.Wrappers +{ + public interface IFileSystemWrapper + { + IFileWrapper File { get; set; } + IDirectoryWrapper Directory { get; set; } + IPathWrapper Path { get; set; } + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs new file mode 100644 index 0000000..9a9c919 --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs @@ -0,0 +1,13 @@ +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + +namespace FreelancerBlog.Core.Wrappers +{ + public interface IFileWrapper + { + bool Exists(string path); + void Delete(string path); + Task SaveAsAsync(IFormFile formFile, string filename, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs new file mode 100644 index 0000000..759552b --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs @@ -0,0 +1,11 @@ +using Microsoft.Extensions.Logging; + +namespace FreelancerBlog.Core.Wrappers +{ + public interface ILoggerFactoryWrapper + { + ILoggerFactory LoggerFactory { get; } + + ILogger CreateLogger(); + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs new file mode 100644 index 0000000..7f8a9f0 --- /dev/null +++ b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs @@ -0,0 +1,9 @@ +namespace FreelancerBlog.Core.Wrappers +{ + public interface IPathWrapper + { + string GetFileNameWithoutExtension(string path); + string GetExtension(string path); + string Combine(params string[] paths); + } +} diff --git a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj index 480e880..c5f8095 100644 --- a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj +++ b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj @@ -5,16 +5,16 @@ - - - + + + All - + diff --git a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj index 3e06c29..30eb363 100644 --- a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj +++ b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj index 2ceece0..249d8d0 100644 --- a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj +++ b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj index a5ecc2f..71b9c07 100644 --- a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj +++ b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj index 7f579a0..c768846 100644 --- a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj +++ b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj index 4ea574f..aa39964 100644 --- a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj +++ b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj @@ -23,14 +23,14 @@ - - + + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj index 9b99857..4223db5 100644 --- a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj +++ b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj @@ -20,8 +20,8 @@ - - + + @@ -32,10 +32,10 @@ - - + + - + runtime; build; native; contentfiles; analyzers diff --git a/FreelancerBlog/FreelancerBlog/Startup.cs b/FreelancerBlog/FreelancerBlog/Startup.cs index 333c526..f389c0b 100644 --- a/FreelancerBlog/FreelancerBlog/Startup.cs +++ b/FreelancerBlog/FreelancerBlog/Startup.cs @@ -90,7 +90,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvcJQueryDataTables(); - services.AddAutoMapper(); + services.AddAutoMapper(typeof(Startup)); services.AddMemoryCache(); From f90cad5504a49501e49f715362741581aea70298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=9E=C3=BCkr=C3=BC=20Berkay?= Date: Sat, 11 Jan 2020 23:38:23 +0300 Subject: [PATCH 2/5] Revert "Update nuget package" This reverts commit 844b73a67a64e2d1317f6d279b997af3d7bcb7fc. --- .../Wrappers/IConfigurationBinderWrapper.cs | 11 ----------- .../Commands/Wrappers/IDirectoryWrapper.cs | 10 ---------- .../Commands/Wrappers/IFileSystemWrapper.cs | 9 --------- .../Commands/Wrappers/IFileWrapper.cs | 13 ------------- .../Commands/Wrappers/ILoggerWrapper.cs | 11 ----------- .../Commands/Wrappers/IPathWrapper.cs | 9 --------- .../FreelancerBlog.Data/FreelancerBlog.Data.csproj | 8 ++++---- .../FreelancerBlog.Infrastructure.csproj | 2 +- .../FreelancerBlog.IntegrationTests.csproj | 4 ++-- .../FreelancerBlog.Services.csproj | 2 +- .../FreelancerBlog.UITests.csproj | 4 ++-- .../FreelancerBlog.UnitTests.csproj | 6 +++--- FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj | 10 +++++----- FreelancerBlog/FreelancerBlog/Startup.cs | 2 +- 14 files changed, 19 insertions(+), 82 deletions(-) delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs delete mode 100644 FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs deleted file mode 100644 index 30fbc1e..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IConfigurationBinderWrapper.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Microsoft.Extensions.Configuration; - -namespace FreelancerBlog.Core.Wrappers -{ - public interface IConfigurationBinderWrapper - { - IConfiguration Configuration { get; } - - T GetValue(string key); - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs deleted file mode 100644 index 195c680..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IDirectoryWrapper.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.IO; - -namespace FreelancerBlog.Core.Wrappers -{ - public interface IDirectoryWrapper - { - bool Exists(string path); - DirectoryInfo CreateDirectory(string path); - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs deleted file mode 100644 index a23df08..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileSystemWrapper.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace FreelancerBlog.Core.Wrappers -{ - public interface IFileSystemWrapper - { - IFileWrapper File { get; set; } - IDirectoryWrapper Directory { get; set; } - IPathWrapper Path { get; set; } - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs deleted file mode 100644 index 9a9c919..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IFileWrapper.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; - -namespace FreelancerBlog.Core.Wrappers -{ - public interface IFileWrapper - { - bool Exists(string path); - void Delete(string path); - Task SaveAsAsync(IFormFile formFile, string filename, CancellationToken cancellationToken = default(CancellationToken)); - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs deleted file mode 100644 index 759552b..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/ILoggerWrapper.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Microsoft.Extensions.Logging; - -namespace FreelancerBlog.Core.Wrappers -{ - public interface ILoggerFactoryWrapper - { - ILoggerFactory LoggerFactory { get; } - - ILogger CreateLogger(); - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs b/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs deleted file mode 100644 index 7f8a9f0..0000000 --- a/FreelancerBlog/FreelancerBlog.Data/Commands/Wrappers/IPathWrapper.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace FreelancerBlog.Core.Wrappers -{ - public interface IPathWrapper - { - string GetFileNameWithoutExtension(string path); - string GetExtension(string path); - string Combine(params string[] paths); - } -} diff --git a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj index c5f8095..480e880 100644 --- a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj +++ b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj @@ -5,16 +5,16 @@ - - - + + + All - + diff --git a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj index 30eb363..3e06c29 100644 --- a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj +++ b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj index 249d8d0..2ceece0 100644 --- a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj +++ b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj index 71b9c07..a5ecc2f 100644 --- a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj +++ b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj index c768846..7f579a0 100644 --- a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj +++ b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj index aa39964..4ea574f 100644 --- a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj +++ b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj @@ -23,14 +23,14 @@ - - + + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj index 4223db5..9b99857 100644 --- a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj +++ b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj @@ -20,8 +20,8 @@ - - + + @@ -32,10 +32,10 @@ - - + + - + runtime; build; native; contentfiles; analyzers diff --git a/FreelancerBlog/FreelancerBlog/Startup.cs b/FreelancerBlog/FreelancerBlog/Startup.cs index f389c0b..333c526 100644 --- a/FreelancerBlog/FreelancerBlog/Startup.cs +++ b/FreelancerBlog/FreelancerBlog/Startup.cs @@ -90,7 +90,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvcJQueryDataTables(); - services.AddAutoMapper(typeof(Startup)); + services.AddAutoMapper(); services.AddMemoryCache(); From 9f3d0642a4291b3432d242a9341eacdba350715c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=9E=C3=BCkr=C3=BC=20Berkay?= Date: Tue, 21 Jan 2020 01:44:53 +0300 Subject: [PATCH 3/5] aricles to articles --- .../Queries/Data/Articles/GetAriclesQuery.cs | 2 +- .../Queries/Articles/GetAriclesQueryHandler.cs | 4 ++-- .../Controllers/Admin/ArticleControllerTests.cs | 2 +- .../Controllers/Root/ArticleControllerTests.cs | 2 +- .../Areas/Admin/Controllers/ArticleController.cs | 2 +- .../FreelancerBlog/Controllers/ArticleController.cs | 2 +- FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj | 2 +- FreelancerBlog/FreelancerBlog/Startup.cs | 12 ++++++++---- 8 files changed, 16 insertions(+), 12 deletions(-) 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.UnitTests/Controllers/Admin/ArticleControllerTests.cs b/FreelancerBlog/FreelancerBlog.UnitTests/Controllers/Admin/ArticleControllerTests.cs index b3075dd..08ab863 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 a8ebc64..6508ce8 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 9d4ee00..c975928 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 b227d57..c753ae2 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/FreelancerBlog.csproj b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj index 9b99857..b787f34 100644 --- a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj +++ b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 2.8 + 3.7 diff --git a/FreelancerBlog/FreelancerBlog/Startup.cs b/FreelancerBlog/FreelancerBlog/Startup.cs index 333c526..3d3aefd 100644 --- a/FreelancerBlog/FreelancerBlog/Startup.cs +++ b/FreelancerBlog/FreelancerBlog/Startup.cs @@ -105,7 +105,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"]; @@ -114,7 +115,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"]; @@ -128,12 +130,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"]; From 99957be99cae7bf6b17133681fc433a2e5812d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=9E=C3=BCkr=C3=BC=20Berkay=28bipro=29?= Date: Sat, 22 Feb 2020 18:43:07 +0300 Subject: [PATCH 4/5] using statement is more useful than DI for seed data here --- .../FreelancerBlogContextSeedData.cs | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/FreelancerBlog/FreelancerBlog.Data/EntityFramework/FreelancerBlogContextSeedData.cs b/FreelancerBlog/FreelancerBlog.Data/EntityFramework/FreelancerBlogContextSeedData.cs index 1dae90d..4fa5e72 100644 --- a/FreelancerBlog/FreelancerBlog.Data/EntityFramework/FreelancerBlogContextSeedData.cs +++ b/FreelancerBlog/FreelancerBlog.Data/EntityFramework/FreelancerBlogContextSeedData.cs @@ -8,13 +8,6 @@ namespace FreelancerBlog.Data.EntityFramework { public class FreelancerBlogContextSeedData { - private readonly FreelancerBlogContext _context; - - public FreelancerBlogContextSeedData(FreelancerBlogContext context) - { - _context = context; - } - public async void SeedAdminUser() { var user = new ApplicationUser @@ -31,24 +24,27 @@ public async void SeedAdminUser() UserGender = "Male" }; - var roleStore = new RoleStore(_context); - - if (!_context.Roles.Any(r => r.Name == "admin")) + using (var _context = new FreelancerBlogContext()) { - await roleStore.CreateAsync(new IdentityRole { Name = "admin", NormalizedName = "admin" }); - } + var roleStore = new RoleStore(_context); - if (!_context.Users.Any(u => u.UserName == user.UserName)) - { - var password = new PasswordHasher(); - var hashed = password.HashPassword(user, "Mc2^6csQ^U88H5pz"); - user.PasswordHash = hashed; - var userStore = new UserStore(_context); - await userStore.CreateAsync(user); - await userStore.AddToRoleAsync(user, "admin"); - } + if (!_context.Roles.Any(r => r.Name == "admin")) + { + await roleStore.CreateAsync(new IdentityRole { Name = "admin", NormalizedName = "admin" }); + } - await _context.SaveChangesAsync(); + if (!_context.Users.Any(u => u.UserName == user.UserName)) + { + var password = new PasswordHasher(); + var hashed = password.HashPassword(user, "Mc2^6csQ^U88H5pz"); + user.PasswordHash = hashed; + var userStore = new UserStore(_context); + await userStore.CreateAsync(user); + await userStore.AddToRoleAsync(user, "admin"); + } + + await _context.SaveChangesAsync(); + } } } } \ No newline at end of file From bda88c633b062a85c77dfdf0a7ffd8c98eda13b5 Mon Sep 17 00:00:00 2001 From: biproberkay Date: Fri, 5 Mar 2021 13:57:14 +0300 Subject: [PATCH 5/5] Revert "Merge branch 'master' of https://github.com/biproberkay/FreelancerBlog" This reverts commit fb0c10b240104be4afc9a717a6217945c8fd7a6e, reversing changes made to 9f3d0642a4291b3432d242a9341eacdba350715c. --- .../FreelancerBlog.Data/FreelancerBlog.Data.csproj | 8 ++++---- .../FreelancerBlog.Infrastructure.csproj | 2 +- .../FreelancerBlog.IntegrationTests.csproj | 4 ++-- .../FreelancerBlog.Services.csproj | 2 +- .../FreelancerBlog.UITests.csproj | 4 ++-- .../FreelancerBlog.UnitTests.csproj | 6 +++--- FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj | 10 +++++----- FreelancerBlog/FreelancerBlog/Startup.cs | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj index c5f8095..480e880 100644 --- a/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj +++ b/FreelancerBlog/FreelancerBlog.Data/FreelancerBlog.Data.csproj @@ -5,16 +5,16 @@ - - - + + + All - + diff --git a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj index 30eb363..3e06c29 100644 --- a/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj +++ b/FreelancerBlog/FreelancerBlog.Infrastructure/FreelancerBlog.Infrastructure.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj index 249d8d0..2ceece0 100644 --- a/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj +++ b/FreelancerBlog/FreelancerBlog.IntegrationTests/FreelancerBlog.IntegrationTests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj index 71b9c07..a5ecc2f 100644 --- a/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj +++ b/FreelancerBlog/FreelancerBlog.Services/FreelancerBlog.Services.csproj @@ -5,7 +5,7 @@ - + diff --git a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj index c768846..7f579a0 100644 --- a/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj +++ b/FreelancerBlog/FreelancerBlog.UITests/FreelancerBlog.UITests.csproj @@ -5,13 +5,13 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj index aa39964..4ea574f 100644 --- a/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj +++ b/FreelancerBlog/FreelancerBlog.UnitTests/FreelancerBlog.UnitTests.csproj @@ -23,14 +23,14 @@ - - + + all runtime; build; native; contentfiles; analyzers - + diff --git a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj index 29295e6..b787f34 100644 --- a/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj +++ b/FreelancerBlog/FreelancerBlog/FreelancerBlog.csproj @@ -20,8 +20,8 @@ - - + + @@ -32,10 +32,10 @@ - - + + - + runtime; build; native; contentfiles; analyzers diff --git a/FreelancerBlog/FreelancerBlog/Startup.cs b/FreelancerBlog/FreelancerBlog/Startup.cs index fe9aef2..3d3aefd 100644 --- a/FreelancerBlog/FreelancerBlog/Startup.cs +++ b/FreelancerBlog/FreelancerBlog/Startup.cs @@ -90,7 +90,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvcJQueryDataTables(); - services.AddAutoMapper(typeof(Startup)); + services.AddAutoMapper(); services.AddMemoryCache();