snapshot tests

Author: MWClayson-NHS

.gitignore

@@ -52,6 +52,7 @@ OutputDirectory
 
 # User Settings
 local.settings.json
+appsettings.json
 
 # Docker
 .env

application/CohortManager/src/Functions/Shared/Common/Extensions/ConfigurationExtension.cs

@@ -10,28 +10,58 @@ namespace Common;
 
 public static class ConfigurationExtension
 {
+    private static List<string> _emptyList = new List<string>();
+
     public static IHostBuilder AddConfiguration<T>(this IHostBuilder hostBuilder, string? keyVaultUrl = null) where T: class
     {
         var configuration = CreateConfiguration(keyVaultUrl);
         return BuildIOptionsDependency<T>(hostBuilder,configuration);
     }
+    /// <summary>
+    /// Create
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="hostBuilder"></param>
+    /// <param name="config"></param>
+    /// <param name="keyVaultUrl"></param>
+    /// <returns></returns>
     public static IHostBuilder AddConfiguration<T>(this IHostBuilder hostBuilder, out T config, string? keyVaultUrl = null) where T: class
     {
         var configuration = CreateConfiguration(keyVaultUrl);
 
         config = configuration.Get<T>();
         return BuildIOptionsDependency<T>(hostBuilder,configuration);
     }
+    /// <summary>
+    /// Creates and bind configuration that is not registered to IOptions
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="keyVaultUrl"></param>
+    /// <param name="configFilePaths"></param>
+    /// <returns></returns>
+    public static T GetConfiguration<T>(string? keyVaultUrl = null, List<string>? configFilePaths = null) where T: class
+    {
+        var configuration = CreateConfiguration(keyVaultUrl, configFilePaths);
+        return configuration.Get<T>();
+
+    }
 
-    private static IConfiguration CreateConfiguration(string? keyVaultUrl = null)
+
+
+
+    private static IConfiguration CreateConfiguration(string? keyVaultUrl = null, List<string>? configFilePaths = null)
     {
 
         var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
         var logger = loggerFactory.CreateLogger(nameof(ConfigurationExtension));
+
         logger.LogInformation("Building Configuration");
         ConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
         keyVaultUrl ??= Environment.GetEnvironmentVariable("KeyVaultConnectionString");
-        if(keyVaultUrl != null){
+
+        if(keyVaultUrl != null)
+        {
             try
             {
                 configBuilder.AddAzureKeyVault(new Uri(keyVaultUrl), new DefaultAzureCredential(), new AzureKeyVaultConfigurationOptions());
@@ -41,6 +71,13 @@ private static IConfiguration CreateConfiguration(string? keyVaultUrl = null)
                 logger.LogError(ex, "Unable to add Azure KeyVault");
             }
         }
+        if(configFilePaths != null)
+        {
+            foreach(var configFile in configFilePaths)
+            {
+                configBuilder.AddJsonFile(configFile);
+            }
+        }
         configBuilder.AddEnvironmentVariables();
         return configBuilder.Build();
     }

application/CohortManager/src/Functions/Shared/DataServices.Database/DataServicesContext.cs

@@ -10,10 +10,11 @@ public class DataServicesContext : DbContext
     DbSet<LanguageCode> languageCodes { get; set; }
     DbSet<CurrentPosting> currentPostings { get; set; }
     DbSet<ExcludedSMULookup> excludedSMULookups { get; set; }
-    public DbSet<ExceptionManagement> exceptionManagements { get; set; }
+    public DbSet<ExceptionManagement> ExceptionManagements { get; set; }
     DbSet<GPPractice> gPPractices { get; set; }
     DbSet<BsSelectRequestAudit> bsSelectRequestAudits {get;set;}
-
+    public DbSet<ParticipantManagement> ParticipantManagements {get;set;}
+    public DbSet<CohortDistribution> CohortDistributions {get;set;}
     public DataServicesContext(DbContextOptions<DataServicesContext> options) : base(options)
     { }
 

tests/snapshot-tests/AddFileTests.cs

@@ -1,26 +1,51 @@
-namespace NHS.CohortManager.Tests.SnapShotTests;
+namespace NHS.CohortManager.Tests.SnapshotTests;
 
 using System.Threading.Tasks;
+using Common;
 using DataServices.Database;
+using DiffEngine;
 using Microsoft.EntityFrameworkCore;
+using Model;
 using VerifyMSTest;
 
 
 [TestClass]
 public class AddFileTests : VerifyBase
 {
     private DataServicesContext _dbContext;
-    [TestInitialize]
-    public void Setup()
+    private readonly VerifySettings verifySettings;
+    public AddFileTests()
     {
+        verifySettings = new VerifySettings();
+        verifySettings.UseDirectory("AddStep1");
+        verifySettings.DontScrubDateTimes();
+        verifySettings.IgnoreMembers<ExceptionManagement>(i => i.ExceptionDate,i => i.ErrorRecord,i => i.DateCreated,i => i.ExceptionId );
+        verifySettings.IgnoreMembers<ParticipantManagement>(i => i.ParticipantId, i => i.RecordInsertDateTime, i => i.RecordInsertDateTime);
+        verifySettings.IgnoreMembers<CohortDistribution>(i => i.CohortDistributionId, i => i.ParticipantId,i => i.RecordInsertDateTime, i => i.RecordUpdateDateTime, i => i.RequestId);
 
-        var options = new DbContextOptionsBuilder<DataServicesContext>().UseSqlServer("").Options;
+        List<string> configFiles = ["appsettings.json"];
+        var config = ConfigurationExtension.GetConfiguration<SnapshotTestsConfig>(null,configFiles);
+
+        var options = new DbContextOptionsBuilder<DataServicesContext>().UseSqlServer(config.ConnectionString).Options;
         _dbContext = new DataServicesContext(options);
+
     }
     [TestMethod]
     public async Task ValidateExceptionTable()
     {
-        var Exceptions = await _dbContext.exceptionManagements.ToListAsync();
-        await Verify(Exceptions);
+        var Exceptions = await _dbContext.ExceptionManagements.OrderBy(i => i.NhsNumber).ThenBy(i => i.RuleId).ToListAsync();
+        await Verify(Exceptions,verifySettings);
+    }
+    [TestMethod]
+    public async Task ValidateParticipantManagementTable()
+    {
+        var Participants = await _dbContext.ParticipantManagements.OrderBy(i => i.NHSNumber).ToListAsync();
+        await Verify(Participants,verifySettings);
+    }
+    [TestMethod]
+    public async Task ValidateCohortDistributionTable()
+    {
+        var Participants = await _dbContext.CohortDistributions.OrderBy(i => i.NHSNumber).ToListAsync();
+        await Verify(Participants,verifySettings);
     }
 }