From 4d6474b6cf42b026d7056c7e2b5488ad09b6ec05 Mon Sep 17 00:00:00 2001 From: Maurits Moeys Date: Fri, 1 Nov 2019 16:29:41 +0100 Subject: [PATCH 1/3] fix: typo --- .../Startups/ClientGeneratedIdsStartup.cs | 2 +- .../Startups/NoDefaultPageSizeStartup.cs | 2 +- src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs | 2 +- src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs | 2 +- src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs | 2 +- src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs | 2 +- test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs index 8f60d43a62..038c0c5f63 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs @@ -34,7 +34,7 @@ public override void ConfigureServices(IServiceCollection services) options.DefaultPageSize = 5; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoaDatabaseValues = true; + options.LoadDatabase = true; options.AllowClientGeneratedIds = true; }, discovery => discovery.AddAssembly(Assembly.Load(nameof(JsonApiDotNetCoreExample))), diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs index a15b71c2c5..75aae44cd5 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs @@ -33,7 +33,7 @@ public override void ConfigureServices(IServiceCollection services) options.Namespace = "api/v1"; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoaDatabaseValues = true; + options.LoadDatabase = true; options.AllowClientGeneratedIds = true; }, discovery => discovery.AddAssembly(Assembly.Load(nameof(JsonApiDotNetCoreExample))), diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs index 3e9d3ca9e3..05652ac2b4 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs @@ -44,7 +44,7 @@ public virtual void ConfigureServices(IServiceCollection services) options.DefaultPageSize = 5; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoaDatabaseValues = true; + options.LoadDatabase = true; }, discovery => discovery.AddCurrentAssembly()); services.AddClientSerialization(); diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs index a969a4dbf0..16a7ba32e6 100644 --- a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs +++ b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs @@ -8,7 +8,7 @@ public interface IJsonApiOptions : ILinksConfiguration, ISerializerOptions /// /// Defaults to . /// - bool LoaDatabaseValues { get; set; } + bool LoadDatabase { get; set; } /// /// Whether or not the total-record count should be included in all document /// level meta objects. diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs index fe41af6602..ea512d4de4 100644 --- a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs +++ b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs @@ -52,7 +52,7 @@ public class JsonApiOptions : IJsonApiOptions /// /// Defaults to . /// - public bool LoaDatabaseValues { get; set; } = false; + public bool LoadDatabase { get; set; } = false; /// /// The base URL Namespace diff --git a/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs b/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs index 5e2ee7731d..4a615460be 100644 --- a/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs +++ b/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs @@ -102,7 +102,7 @@ public bool ShouldLoadDbValues(Type entityType, ResourceHook hook) return false; if (discovery.DatabaseValuesEnabledHooks.Contains(hook)) return true; - return _options.LoaDatabaseValues; + return _options.LoadDatabase; } bool ShouldExecuteHook(RightType entityType, ResourceHook hook) diff --git a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs index c341106d0e..03c57befa9 100644 --- a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs +++ b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs @@ -145,7 +145,7 @@ public class HooksTestsSetup : HooksDummyData var pfMock = new Mock(); var ufMock = new Mock(); var iqsMock = new Mock(); - var optionsMock = new JsonApiOptions { LoaDatabaseValues = false }; + var optionsMock = new JsonApiOptions { LoadDatabase = false }; return (ufMock, iqsMock, pfMock, optionsMock); } From 73f950f8080c66bee0e7fcb2714ab7008654edf5 Mon Sep 17 00:00:00 2001 From: Maurits Moeys Date: Fri, 1 Nov 2019 16:31:47 +0100 Subject: [PATCH 2/3] fix: typo in fix of typo --- .../Startups/ClientGeneratedIdsStartup.cs | 2 +- .../Startups/NoDefaultPageSizeStartup.cs | 2 +- src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs | 2 +- src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs | 2 +- src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs | 2 +- src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs | 2 +- test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs index 038c0c5f63..665096060c 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/ClientGeneratedIdsStartup.cs @@ -34,7 +34,7 @@ public override void ConfigureServices(IServiceCollection services) options.DefaultPageSize = 5; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoadDatabase = true; + options.LoadDatabaseValues = true; options.AllowClientGeneratedIds = true; }, discovery => discovery.AddAssembly(Assembly.Load(nameof(JsonApiDotNetCoreExample))), diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs index 75aae44cd5..f0ee0a6acb 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/NoDefaultPageSizeStartup.cs @@ -33,7 +33,7 @@ public override void ConfigureServices(IServiceCollection services) options.Namespace = "api/v1"; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoadDatabase = true; + options.LoadDatabaseValues = true; options.AllowClientGeneratedIds = true; }, discovery => discovery.AddAssembly(Assembly.Load(nameof(JsonApiDotNetCoreExample))), diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs index 05652ac2b4..e4d4bdd2a2 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs @@ -44,7 +44,7 @@ public virtual void ConfigureServices(IServiceCollection services) options.DefaultPageSize = 5; options.IncludeTotalRecordCount = true; options.EnableResourceHooks = true; - options.LoadDatabase = true; + options.LoadDatabaseValues = true; }, discovery => discovery.AddCurrentAssembly()); services.AddClientSerialization(); diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs index 16a7ba32e6..374441474d 100644 --- a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs +++ b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs @@ -8,7 +8,7 @@ public interface IJsonApiOptions : ILinksConfiguration, ISerializerOptions /// /// Defaults to . /// - bool LoadDatabase { get; set; } + bool LoadDatabaseValues { get; set; } /// /// Whether or not the total-record count should be included in all document /// level meta objects. diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs index ea512d4de4..cb76720a75 100644 --- a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs +++ b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs @@ -52,7 +52,7 @@ public class JsonApiOptions : IJsonApiOptions /// /// Defaults to . /// - public bool LoadDatabase { get; set; } = false; + public bool LoadDatabaseValues { get; set; } = false; /// /// The base URL Namespace diff --git a/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs b/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs index 4a615460be..af364d4ceb 100644 --- a/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs +++ b/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs @@ -102,7 +102,7 @@ public bool ShouldLoadDbValues(Type entityType, ResourceHook hook) return false; if (discovery.DatabaseValuesEnabledHooks.Contains(hook)) return true; - return _options.LoadDatabase; + return _options.LoadDatabaseValues; } bool ShouldExecuteHook(RightType entityType, ResourceHook hook) diff --git a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs index 03c57befa9..ea7db285d6 100644 --- a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs +++ b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs @@ -145,7 +145,7 @@ public class HooksTestsSetup : HooksDummyData var pfMock = new Mock(); var ufMock = new Mock(); var iqsMock = new Mock(); - var optionsMock = new JsonApiOptions { LoadDatabase = false }; + var optionsMock = new JsonApiOptions { LoadDatabaseValues = false }; return (ufMock, iqsMock, pfMock, optionsMock); } From 4766426b4ad61e36c01320b9954d64d1908c9405 Mon Sep 17 00:00:00 2001 From: Maurits Moeys Date: Fri, 1 Nov 2019 16:55:09 +0100 Subject: [PATCH 3/3] chore: enable sql logging in JsonApiDotNetCoreExample --- src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs | 7 ++++++- src/Examples/JsonApiDotNetCoreExample/appsettings.json | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/Examples/JsonApiDotNetCoreExample/appsettings.json diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs index e4d4bdd2a2..387287a243 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs @@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore; using JsonApiDotNetCore.Extensions; using System; +using Microsoft.Extensions.Logging.Console; +using Microsoft.Extensions.Logging.Debug; namespace JsonApiDotNetCoreExample { @@ -24,6 +26,7 @@ public Startup(IWebHostEnvironment env) Config = builder.Build(); } + public virtual void ConfigureServices(IServiceCollection services) { var loggerFactory = new LoggerFactory(); @@ -36,7 +39,9 @@ public virtual void ConfigureServices(IServiceCollection services) }) .AddDbContext(options => { - options.UseNpgsql(GetDbConnectionString(), options => options.SetPostgresVersion(new Version(9,6))); + options.UseLoggerFactory(new LoggerFactory(new[] { new DebugLoggerProvider() })) + .EnableSensitiveDataLogging() + .UseNpgsql(GetDbConnectionString(), options => options.SetPostgresVersion(new Version(9,6))); }, ServiceLifetime.Transient) .AddJsonApi(options => { diff --git a/src/Examples/JsonApiDotNetCoreExample/appsettings.json b/src/Examples/JsonApiDotNetCoreExample/appsettings.json old mode 100755 new mode 100644 index c468439079..38f0280d9f --- a/src/Examples/JsonApiDotNetCoreExample/appsettings.json +++ b/src/Examples/JsonApiDotNetCoreExample/appsettings.json @@ -7,7 +7,10 @@ "LogLevel": { "Default": "Warning", "System": "Warning", - "Microsoft": "Warning" + "Microsoft": "Warning", + "LogLevel": { + "Microsoft.EntityFrameworkCore": "Debug" + } } } }