diff options
Diffstat (limited to 'code/api/src/Utilities')
| -rw-r--r-- | code/api/src/Utilities/ConfigurationExtensions.cs | 49 | ||||
| -rw-r--r-- | code/api/src/Utilities/SwaggerGenOptionsExtensions.cs | 6 |
2 files changed, 26 insertions, 29 deletions
diff --git a/code/api/src/Utilities/ConfigurationExtensions.cs b/code/api/src/Utilities/ConfigurationExtensions.cs index 405c702..c95e293 100644 --- a/code/api/src/Utilities/ConfigurationExtensions.cs +++ b/code/api/src/Utilities/ConfigurationExtensions.cs @@ -9,15 +9,15 @@ public static class ConfigurationExtensions var user = configuration.DB_USER; var password = configuration.DB_PASSWORD; - var res = ""; + string result; if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; } else { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } - Log.Debug("Using app database connection string: " + res); - return res; + Log.Debug("Using app database connection string: " + result); + return result; } public static string GetAppDatabaseConnectionString(this IConfiguration config, Func<AppConfiguration> configuration) { @@ -28,15 +28,15 @@ public static class ConfigurationExtensions var user = _configuration.DB_USER; var password = _configuration.DB_PASSWORD; - var res = ""; + string result; if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; } else { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } - Log.Debug("Using app database connection string: " + res); - return res; + Log.Debug("Using app database connection string: " + result); + return result; } public static string GetQuartzDatabaseConnectionString(this IConfiguration config, AppConfiguration configuration) { @@ -46,15 +46,15 @@ public static class ConfigurationExtensions var user = configuration.QUARTZ_DB_USER; var password = configuration.QUARTZ_DB_PASSWORD; - var res = ""; + string result; if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; } else { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } - Log.Debug("Using quartz database connection string: " + res); - return res; + Log.Debug("Using quartz database connection string: " + result); + return result; } public static string GetQuartzDatabaseConnectionString(this IConfiguration config, Func<AppConfiguration> configuration) { @@ -65,24 +65,21 @@ public static class ConfigurationExtensions var user = _configuration.QUARTZ_DB_USER; var password = _configuration.QUARTZ_DB_PASSWORD; - var res = ""; + string result; if (config.GetValue<string>("ASPNETCORE_ENVIRONMENT") == "Development") { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password};Include Error Detail=true"; } else { - res = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; + result = $"Server={host};Port={port};Database={database};User Id={user};Password={password}"; } - Log.Debug("Using quartz database connection string: " + res); - return res; + Log.Debug("Using quartz database connection string: " + result); + return result; } public static string GetVersion(this IConfiguration configuration) { var versionFilePath = Path.Combine(AppPaths.AppData.HostPath, "version.txt"); - if (File.Exists(versionFilePath)) { - var versionText = File.ReadAllText(versionFilePath); - return versionText + "-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT"); - } - - return "unknown-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT"); + if (!File.Exists(versionFilePath)) return "unknown-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT"); + var versionText = File.ReadAllText(versionFilePath); + return versionText + "-" + configuration.GetValue<string>("ASPNETCORE_ENVIRONMENT"); } } diff --git a/code/api/src/Utilities/SwaggerGenOptionsExtensions.cs b/code/api/src/Utilities/SwaggerGenOptionsExtensions.cs index a2dcf7a..0a7e07f 100644 --- a/code/api/src/Utilities/SwaggerGenOptionsExtensions.cs +++ b/code/api/src/Utilities/SwaggerGenOptionsExtensions.cs @@ -1,8 +1,8 @@ #nullable enable +using IOL.GreatOffice.Api.Endpoints.V1; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.Controllers; using Swashbuckle.AspNetCore.SwaggerGen; -using BaseRoute = IOL.GreatOffice.Api.Endpoints.V1.BaseRoute; namespace IOL.GreatOffice.Api.Utilities; @@ -10,7 +10,7 @@ public static class SwaggerGenOptionsExtensions { /// <summary> /// Updates Swagger document to support ApiEndpoints.<br/><br/> - /// For controllers inherited from <see cref="BaseRoute"/>:<br/> + /// For controllers inherited from <see cref="V1_EndpointBase"/>:<br/> /// - Replaces action Tag with <c>[namespace]</c><br/> /// </summary> public static void UseApiEndpoints(this SwaggerGenOptions options) { @@ -22,7 +22,7 @@ public static class SwaggerGenOptionsExtensions throw new InvalidOperationException($"Unable to determine tag for endpoint: {api.ActionDescriptor.DisplayName}"); } - if (actionDescriptor.ControllerTypeInfo.GetBaseTypesAndThis().Any(t => t == typeof(BaseRoute))) { + if (actionDescriptor.ControllerTypeInfo.GetBaseTypesAndThis().Any(t => t == typeof(V1_EndpointBase))) { return new[] { actionDescriptor.ControllerTypeInfo.Namespace?.Split('.').Last() }; |