work in progress

ardalis · ardalis · commit f45cf76d244b · 2025-04-11T13:36:54.000-04:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="altcover" Version="8.8.173" />
@@ -62,6 +62,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.13" />
     <PackageVersion Include="NETStandard.Library" Version="2.0.3" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NimblePros.Metronome" Version="0.4.1" />
     <PackageVersion Include="NimblePros.Vimeo" Version="1.0.10" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="ReportGenerator" Version="5.1.25" />
diff --git a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
@@ -48,6 +48,7 @@
 		</PackageReference>
 		<PackageReference Include="Microsoft.Web.LibraryManager.Build" />
 		<PackageReference Include="Newtonsoft.Json" />
+		<PackageReference Include="NimblePros.Metronome" />
 		<PackageReference Include="NimblePros.Vimeo" />
 		<PackageReference Include="Sendgrid" />
 		<PackageReference Include="Serilog" />
diff --git a/src/DevBetterWeb.Web/Program.cs b/src/DevBetterWeb.Web/Program.cs
@@ -31,6 +31,7 @@
 using DevBetterWeb.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using NimblePros.Vimeo.Extensions;
+using NimblePros.Metronome;
 
 // 29 Aug 2023 - Getting a nullref in here somewhere maybe? Also a stack overflow during startup somewhere.
 
@@ -72,6 +73,8 @@
 	builder.Services.AddStartupNotificationService();
 }
 
+builder.Services.AddMetronome();
+
 // TEST SERVICES
 //if (builder.Environment.EnvironmentName.ToLower() == "testing")
 //{
@@ -83,9 +86,11 @@
 
 if (!builder.Services.Any(x => x.ServiceType == typeof(AppDbContext)))
 {
-	builder.Services.AddDbContext<AppDbContext>(options =>
+	builder.Services.AddDbContext<AppDbContext>((provider, options) =>
 			options.UseSqlServer(builder.Configuration
-					.GetConnectionString(Constants.DEFAULT_CONNECTION_STRING_NAME)));
+					.GetConnectionString(Constants.DEFAULT_CONNECTION_STRING_NAME))
+			.AddMetronomeDbTracking(provider)
+			);
 }
 builder.Services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>));
 
@@ -167,6 +172,7 @@
 {
 	app.UseDeveloperExceptionPage();
 	app.UseShowAllServicesMiddleware();
+	app.UseMetronomeLoggingMiddleware();
 }
 else
 {
diff --git a/src/DevBetterWeb.Web/appsettings.json b/src/DevBetterWeb.Web/appsettings.json
@@ -5,7 +5,7 @@
 	"videoUrlPrefix": "https://devbetter2storage.blob.core.windows.net/videos/",
 	"GoogleMapsAPIKey": "GOOGLE_MAPS_API_KEY",
 	"ConnectionStrings": {
-		"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=DevBetterWeb.App;Trusted_Connection=True;MultipleActiveResultSets=true"
+		"DefaultConnection": "Server=localhost\\sqlexpress;Database=DevBetterWeb.App;Trusted_Connection=False;MultipleActiveResultSets=true"
 	},
 	"VimeoSettings": {
 		"Token": "[vimeo token string goes here]",
diff --git a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj b/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/tests.sln b/tests/tests.sln
@@ -0,0 +1,37 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevBetterWeb.FunctionalTests", "DevBetterWeb.FunctionalTests\DevBetterWeb.FunctionalTests.csproj", "{23B85581-53F6-48C2-B7C2-0BD71DB45B5D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevBetterWeb.Tests", "DevBetterWeb.Tests\DevBetterWeb.Tests.csproj", "{0002B2C1-F170-4000-83A2-6FA27305F756}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevBetterWeb.UnitTests", "DevBetterWeb.UnitTests\DevBetterWeb.UnitTests.csproj", "{B24654DE-E71E-41E3-9F26-5652FA15B763}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{23B85581-53F6-48C2-B7C2-0BD71DB45B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B85581-53F6-48C2-B7C2-0BD71DB45B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23B85581-53F6-48C2-B7C2-0BD71DB45B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23B85581-53F6-48C2-B7C2-0BD71DB45B5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0002B2C1-F170-4000-83A2-6FA27305F756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0002B2C1-F170-4000-83A2-6FA27305F756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0002B2C1-F170-4000-83A2-6FA27305F756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0002B2C1-F170-4000-83A2-6FA27305F756}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B24654DE-E71E-41E3-9F26-5652FA15B763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B24654DE-E71E-41E3-9F26-5652FA15B763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B24654DE-E71E-41E3-9F26-5652FA15B763}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B24654DE-E71E-41E3-9F26-5652FA15B763}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E0D51B1-E07B-4DAF-BBAF-E1D77481BD8D}
+	EndGlobalSection
+EndGlobal

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`using DevBetterWeb.Infrastructure;`
`32`	`32`	`using Microsoft.Extensions.Configuration;`
`33`	`33`	`using NimblePros.Vimeo.Extensions;`
	`34`	`+using NimblePros.Metronome;`
`34`	`35`
`35`	`36`	`// 29 Aug 2023 - Getting a nullref in here somewhere maybe? Also a stack overflow during startup somewhere.`
`36`	`37`
`@@ -72,6 +73,8 @@`
`72`	`73`	`builder.Services.AddStartupNotificationService();`
`73`	`74`	`}`
`74`	`75`
	`76`	`+builder.Services.AddMetronome();`
	`77`	`+`
`75`	`78`	`// TEST SERVICES`
`76`	`79`	`//if (builder.Environment.EnvironmentName.ToLower() == "testing")`
`77`	`80`	`//{`
`@@ -83,9 +86,11 @@`
`83`	`86`
`84`	`87`	`if (!builder.Services.Any(x => x.ServiceType == typeof(AppDbContext)))`
`85`	`88`	`{`
`86`		`- builder.Services.AddDbContext<AppDbContext>(options =>`
	`89`	`+ builder.Services.AddDbContext<AppDbContext>((provider, options) =>`
`87`	`90`	`options.UseSqlServer(builder.Configuration`
`88`		`- .GetConnectionString(Constants.DEFAULT_CONNECTION_STRING_NAME)));`
	`91`	`+ .GetConnectionString(Constants.DEFAULT_CONNECTION_STRING_NAME))`
	`92`	`+ .AddMetronomeDbTracking(provider)`
	`93`	`+ );`
`89`	`94`	`}`
`90`	`95`	`builder.Services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>));`
`91`	`96`
`@@ -167,6 +172,7 @@`
`167`	`172`	`{`
`168`	`173`	`app.UseDeveloperExceptionPage();`
`169`	`174`	`app.UseShowAllServicesMiddleware();`
	`175`	`+ app.UseMetronomeLoggingMiddleware();`
`170`	`176`	`}`
`171`	`177`	`else`
`172`	`178`	`{`