Address PR review feedback: consolidate tests, improve dispose pattern, and restore error handling

Co-authored-by: Keboo <[email protected]>

Author: Copilot

EssentialCSharp.Web.Tests/FunctionalTests.cs

@@ -24,7 +24,11 @@ public async Task WhenTheApplicationStarts_ItCanLoadLoadPages(string relativeUrl
     [InlineData("/guidelines?rid=test-referral-id")]
     [InlineData("/about?rid=abc123")]
     [InlineData("/hello-world?rid=user-referral")]
-    public async Task WhenPagesAreAccessedWithRidParameter_TheyReturnContentSuccessfully(string relativeUrl)
+    [InlineData("/guidelines?rid=")]
+    [InlineData("/about?rid=   ")]
+    [InlineData("/guidelines?foo=bar")]
+    [InlineData("/about?someOtherParam=value")]
+    public async Task WhenPagesAreAccessed_TheyReturnHtml(string relativeUrl)
     {
         using WebApplicationFactory factory = new();
 
@@ -41,23 +45,6 @@ public async Task WhenPagesAreAccessedWithRidParameter_TheyReturnContentSuccessf
         Assert.Contains("<html", content, StringComparison.OrdinalIgnoreCase);
     }
 
-    [Theory]
-    [InlineData("/guidelines?rid=")]
-    [InlineData("/about?rid=   ")]
-    public async Task WhenPagesAreAccessedWithEmptyRidParameter_TheyStillWork(string relativeUrl)
-    {
-        using WebApplicationFactory factory = new();
-
-        HttpClient client = factory.CreateClient();
-        using HttpResponseMessage response = await client.GetAsync(relativeUrl);
-
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-        
-        string content = await response.Content.ReadAsStringAsync();
-        Assert.NotEmpty(content);
-        Assert.Contains("<html", content, StringComparison.OrdinalIgnoreCase);
-    }
-
     [Fact]
     public async Task WhenTheApplicationStarts_NonExistingPage_GivesCorrectStatusCode()
     {
@@ -68,21 +55,4 @@ public async Task WhenTheApplicationStarts_NonExistingPage_GivesCorrectStatusCod
 
         Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
     }
-
-    [Theory]
-    [InlineData("/guidelines?foo=bar")]
-    [InlineData("/about?someOtherParam=value")]
-    public async Task WhenPagesAreAccessedWithNonRidParameters_TheyStillWork(string relativeUrl)
-    {
-        using WebApplicationFactory factory = new();
-
-        HttpClient client = factory.CreateClient();
-        using HttpResponseMessage response = await client.GetAsync(relativeUrl);
-
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-        
-        string content = await response.Content.ReadAsStringAsync();
-        Assert.NotEmpty(content);
-        Assert.Contains("<html", content, StringComparison.OrdinalIgnoreCase);
-    }
 }

EssentialCSharp.Web.Tests/WebApplicationFactory.cs

@@ -45,9 +45,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-        if (disposing && _Connection != null)
+        if (disposing)
         {
-            _Connection.Dispose();
+            _Connection?.Dispose();
             _Connection = null;
         }
     }

EssentialCSharp.Web/Middleware/ReferralTrackingMiddleware.cs

@@ -27,13 +27,20 @@ public async Task InvokeAsync(HttpContext context, IReferralService referralServ
             return;
         }
 
-        if (context.User is { Identity.IsAuthenticated: true } claimsUser)
+        try
         {
-            referralService.TrackReferralAsync(referralId, claimsUser);
+            if (context.User is { Identity.IsAuthenticated: true } claimsUser)
+            {
+                referralService.TrackReferralAsync(referralId, claimsUser);
+            }
+            else
+            {
+                referralService.TrackReferralAsync(referralId, null);
+            }
         }
-        else
+        catch (Exception ex)
         {
-            referralService.TrackReferralAsync(referralId, null);
+            _Logger.LogError(ex, "Failed to track referral ID {ReferralId}", referralId);
         }
 
         await _Next(context);