From 47cc22a181f05e95235ac9db07d17cdb979b4f8d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 15 Mar 2022 23:47:24 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/TrialController.cs | 10 +++++----- server/AyaNova/Startup.cs | 2 +- server/AyaNova/resource/en.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/Controllers/TrialController.cs b/server/AyaNova/Controllers/TrialController.cs index 640b72d9..5b28e8d8 100644 --- a/server/AyaNova/Controllers/TrialController.cs +++ b/server/AyaNova/Controllers/TrialController.cs @@ -71,7 +71,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, "Current license is not a trial license key. Only a trial can be seeded.")); } - Seeder.Level.SeedLevel seedLevel = Seeder.Level.StringToSeedLevel(seedOptions.Size); + Seeder.Level.SeedLevel seedLevel = Seeder.Level.StringToSeedLevel(seedOptions.SeedLevel); if (seedLevel == Seeder.Level.SeedLevel.NotValid) return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "size", "Valid values are \"small\", \"medium\", \"large\", \"huge\"")); @@ -79,7 +79,7 @@ namespace AyaNova.Api.Controllers JObject o = JObject.FromObject(new { - seedLevel = seedOptions.Size, + seedLevel = seedLevel, timeZoneOffset = seedOptions.TimeZoneOffset, e2e = seedOptions.E2e, forceEmail=seedOptions.ForceEmail, @@ -87,14 +87,14 @@ namespace AyaNova.Api.Controllers }); OpsJob j = new OpsJob(); - j.Name = $"Seed test data (size={seedOptions.Size})"; + j.Name = $"Seed test data (size={seedOptions.SeedLevel})"; j.JobType = JobType.SeedTestData; j.Exclusive = true;//don't run other jobs, this will erase the db j.JobInfo = o.ToString(); await JobsBiz.AddJobAsync(j); //Log - await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.TrialSeeder, AyaEvent.Created, seedOptions.Size), ct); + await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.TrialSeeder, AyaEvent.Created, seedOptions.SeedLevel), ct); return Accepted(new { JobId = j.GId });//202 accepted } @@ -103,7 +103,7 @@ namespace AyaNova.Api.Controllers public class SeedOptions { [Required] - public string Size { get; set; } + public string SeedLevel { get; set; } [Required] public decimal TimeZoneOffset { get; set; } public bool E2e { get; set; } = false; diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 4791c970..38b3aeb3 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -316,7 +316,7 @@ namespace AyaNova //////////////////////////////////////////////////////////// // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // - public async void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IWebHostEnvironment env, + public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IWebHostEnvironment env, AyContext dbContext, IApiVersionDescriptionProvider provider, AyaNova.Api.ControllerHelpers.ApiServerState apiServerState, IServiceProvider serviceProvider) { diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index a9e63f99..9a1c8771 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -349,7 +349,7 @@ "ErrorUserNotAuthenticated": "Not authenticated (E16)", "ErrorUserNotAuthorized": "Not authorized", "Evaluate": "Evaluate", - "EvaluateAppendPassword": "Append this text to all sample User passwords (optional)", + "EvaluateAppendPassword": "Append this to all sample User passwords (optional)", "EvaluateForceEmail": "Set all email addresses to this (optional)", "EvaluationGuide": "Evaluation guide", "EvaluationRequestReceived": "Request received, check your email for verification",