From 5d6fcf7f0d2ed2ea030a5997016977adb1b1de38 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 5 Jun 2020 19:56:09 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/Startup.cs | 5 +++-- server/AyaNova/util/Seeder.cs | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 379d2046..f994e0f9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -49,7 +49,7 @@ "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", - "AYANOVA_SERVER_TEST_MODE":"false", + "AYANOVA_SERVER_TEST_MODE":"true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7", "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 58ce6449..677b47f8 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -51,7 +51,7 @@ namespace AyaNova _newLog.LogDebug("Initializing services..."); _newLog.LogDebug("Health"); - services.AddHealthChecks().AddDbContextCheck();; + services.AddHealthChecks().AddDbContextCheck(); ; _newLog.LogDebug("Profiler"); //https://dotnetthoughts.net/using-miniprofiler-in-aspnetcore-webapi/ @@ -572,7 +572,8 @@ namespace AyaNova _newLog.LogInformation($"Server test mode seeding, level is {ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL}, tz offset is {ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET}"); AyaNova.Core.License.FetchKeyAsync(apiServerState, dbContext, _newLog).Wait(); //NOTE: For unit testing make sure the time zone is same as tester to ensure list filter by date tests will work because server is on same page as user in terms of time - Util.Seeder.SeedDatabaseAsync(Util.Seeder.StringToSeedLevel(ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL), ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET).Wait(); + var seed = new Util.SeederNew(); + seed.SeedDatabaseAsync(SeederNew.Level.StringToSeedLevel(ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL), ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET).Wait(); } //TESTING diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 3c56ea5c..d0533e3c 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -738,7 +738,6 @@ namespace AyaNova.Util //this is 4 times slower than doing it inside the loop below //seems counterintuitive but maybe it's to do with the db context not being refreshed? - var f = new Bogus.Faker();//todo: this *can't* be right, I'm seeding 20k widgets in some cases @@ -752,7 +751,7 @@ namespace AyaNova.Util { Widget o = new Widget(); o.Name = Uniquify(f.Commerce.ProductName()); - o.Active = true; + o.Active = true; DateTime dtSeed = f.Date.Between(seedStartWindow, seedEndWindow).ToUniversalTime(); o.StartDate = dtSeed; o.EndDate = dtSeed.AddMinutes(60).ToUniversalTime();