Merge spint/#10 into sprint/#11

.gitignore

@@ -379,4 +379,5 @@ FodyWeavers.xsd
 /Ozym.EntityModel/*bundle
 
 # Ingore commit message text
-.commit
+.commit
+*.env

Ozym.API.Test/Ozym.API.Test.csproj

@@ -14,11 +14,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Ozym.API/Dockerfile

@@ -25,12 +25,14 @@ COPY . .
 WORKDIR /src/Ozym.API
 
 # Build the web api project.
-RUN dotnet build "Ozym.API.csproj" -c Release -o /app/build
+ARG CONFIGURATION
+RUN dotnet build "Ozym.API.csproj" -c $CONFIGURATION -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "Ozym.API.csproj" -c Release -o /app/publish /p:UseAppHost=false --property WarningLevel=1
+ARG CONFIGURATION
+RUN dotnet publish "Ozym.API.csproj" -c $CONFIGURATION -o /app/publish /p:UseAppHost=false --property WarningLevel=1
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Ozym.API.dll", "--environment=Development"]
+ENTRYPOINT ["dotnet", "Ozym.API.dll"]

Ozym.API/Ozym.API.csproj

@@ -14,14 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="6.0.4" />
+    <PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
     <PackageReference Include="Ichosys.Extensions.Configuration" Version="3.0.0.5070" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
+    <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
   <ItemGroup>

Ozym.API/Program.cs

@@ -12,6 +12,7 @@
 using System;
 using Asp.Versioning;
 using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging;
 
 namespace Ozym.Api
 {
@@ -20,14 +21,20 @@ public class Program
     {
         public static void Main(string[] args)
         {
+
             var builder = WebApplication.CreateBuilder(args);
-
             var logger = ConvertFromSerilogILogger(logger: BuildLogger());
+            AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) =>
+            {
+                logger?.Log(
+                    logLevel: LogLevel.Critical,
+                    message: "Unhandled exception encountered.\n{Exception}",
+                    eventArgs.ExceptionObject as Exception);
+                Console.WriteLine("Application terminating: {0}", eventArgs.IsTerminating);
 
-            // If Windows OS, secure appsetings.json is supported.
-            bool isWindowsOS = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            var config = BuildConfiguration(
-                logger, builder.Environment.EnvironmentName, configureSecureJson: isWindowsOS);
+            };
+
+            var config = BuildConfiguration(logger, builder.Environment.EnvironmentName);
 
             // Add services to DI container
             builder.Services.AddSingleton(implementationInstance: logger);
@@ -87,48 +94,39 @@ public static void Main(string[] args)
         /// </summary>
         /// <param name="logger">The <see cref="ILogger"/> to use.</param>
         /// <param name="environment"></param>
-        /// <param name="configureSecureJson"></param>
         /// <returns>An <see cref="IConfiguration"/>.</returns>
         private static IConfigurationRoot BuildConfiguration(
             ILogger logger,
-            string environment,
-            bool configureSecureJson = true)
+            string environment)
         {
             if (string.IsNullOrEmpty(environment))
                 throw new ArgumentNullException(paramName: nameof(environment));
 
-            IConfigurationRoot config;
-            if (configureSecureJson)
-            {
-                config = new ConfigurationBuilder()
-                .AddSecureJsonWritable(
-                    path: $"appsettings.api.{environment}.json",
-                    logger: logger,
+            IConfigurationRoot config = new ConfigurationBuilder()
+                .AddEnvironmentVariables()
+                .AddJsonWritable(
+                    path: $"appsettings.{environment}.json",
                     optional: false,
                     reloadOnChange: true)
-                .AddUserSecrets<Program>()
                 .Build();
 
-                string rsaKeyAddress = "_file:RsaKeyContainer";
-                if (config[rsaKeyAddress] is null)
-                {
-                    config[rsaKeyAddress] = $"E1EB57FA-8D2C-41CF-912A-DDBC39534A39";
-                    config.Commit();
-                }
-
-                config["ConnectionStrings:OzymWorks"] = config["ConnectionStrings:OzymWorks"];
-                config["ConnectionStrings:OzymIdentity"] = config["ConnectionStrings:OzymIdentity"];
-                config.Commit();
-            }
-            else
-            {
-                config = new ConfigurationBuilder()
-                    .AddJsonWritable(
-                        path: $"appsettings.api.{environment}.json",
-                        optional: false,
-                        reloadOnChange: true)
-                    .Build();
-            }
+            string connectionStringPattern = config["ConnectionStrings:__pattern__"] ??
+                throw new InvalidOperationException(
+                    "Configuration key 'ConnectionStrings:__pattern__' is undefined.");
+
+            string dockerDatabaseService = config["DOCKER_DATABASE_SERVICE"]
+                ?? throw new InvalidOperationException(
+                    "Configuration key 'DOCKER_DATABASE_SERVICE' is undefined.");
+
+            config["ConnectionStrings:OzymWorks"] = string.Format(
+                connectionStringPattern,
+                dockerDatabaseService,
+                "OzymWorks",
+                "OzymAppUser",
+                config["OZYM_APP_PASSWORD"]);
+
+            config.Commit();
+            config.Reload();
 
             return config;
         }

Ozym.API/Properties/launchSettings.json

@@ -1,20 +1,12 @@
 {
   "profiles": {
-    "Ozym.Api": {
+    "Ozym.API": {
       "commandName": "Project",
-      "launchUrl": "swagger",
+      "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "https://+:443;http://+:80"
       },
-      "publishAllPorts": true,
-      "useSSL": true
+      "applicationUrl": "https://localhost:50702;http://localhost:50703"
     }
   }
 }

Ozym.API/appsettings.Development.json

@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "__pattern__": "Server={0};Database={1};User Id={2};Password='{3}';TrustServerCertificate=true",
+    "OzymWorks": "{set in program startup}",
+    "OzymIdentity": "{set in program startup}"
+  },
+  "DATABASE_PROVIDER": "SQL_SERVER"
+}

Ozym.API/appsettings.json

@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "ConnectionStrings": {
+    "__pattern__": "Server={0};Database={1};User Id={2};Password='{3}';TrustServerCertificate=true",
+    "OzymWorks": "{set in program startup}",
+    "OzymIdentity": "{set in program startup}"
+  },
+  "DATABASE_PROVIDER": "SQL_SERVER"
+}

Ozym.DAL.Test/EntityModelService/_IModelCollectionServiceTest.cs

@@ -9,12 +9,6 @@ namespace Ozym.Test.EntityModelService
     /// <typeparam name="T"></typeparam>
     public interface IModelCollectionServiceTest<T>
     {
-        /// <summary>
-        /// Verifies the unit of work for generating the default <typeparamref name="T"/> model.
-        /// </summary>
-        /// <returns></returns>
-        Task GetDefault_Yields_Model_Instance();
-
         /// <summary>
         /// Verifies the unit of work for checking a model exists using a key value.
         /// </summary>

Ozym.DAL.Test/EntityModelService/_ModelCollectionServiceTest.cs

@@ -16,15 +16,6 @@ namespace Ozym.Test.EntityModelService
     public abstract partial class ModelCollectionServiceTest<T> : IModelCollectionServiceTest<T>
         where T : class, new()
     {
-        /// <inheritdoc/>
-        [TestMethod]
-        public virtual async Task GetDefault_Yields_Model_Instance()
-        {
-            var model = await GetModelService().GetDefaultAsync();
-
-            Assert.IsInstanceOfType(model, typeof(T));
-        }
-
         /// <inheritdoc/>
         [TestMethod]
         public virtual void ModelExists_KeyIsPresent_Returns_True()

Ozym.DAL.Test/Ozym.DAL.Test.csproj

@@ -22,19 +22,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-	  <PackageReference Include="MSTest.TestAdapter" Version="3.1.1">
+	  <PackageReference Include="MSTest.TestAdapter" Version="3.4.3">
 		  <TreatAsUsed>true</TreatAsUsed>
 	  </PackageReference>
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Ozym.DAL/DataTransfer/Common/SecurityDto.cs

@@ -153,7 +153,9 @@ public bool HasPerpetualPrice
             Name = nameof(SecurityDto_SR.CurrentySymbol_Name),
             Description = nameof(SecurityDto_SR.CurrentSymbol_Description),
             ResourceType = typeof(SecurityDto_SR))]
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public string? CurrentSymbol { get; set; }
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
     }
 
     [Noun(
@@ -169,8 +171,8 @@ public class SecurityDto : SecurityDtoBase
 
         public SecurityDto()
         {
-            Attributes = new HashSet<SecurityAttributeDto>();
-            Symbols = new HashSet<SecuritySymbolDto>();
+            Attributes = [];
+            Symbols = [];
         }
 
         public ICollection<SecurityAttributeDto> Attributes