fix(sample): critical DI, exception handling, and mapping fixes

Author: Per Kops

sample/.editorconfig

@@ -511,6 +511,8 @@ dotnet_diagnostic.S1135.severity = suggestion       # https://github.com/atc-net
 ##########################################
 [*.{cs,csx,cake}]
 
+MA0051.maximum_lines_per_method = 100
+
 dotnet_diagnostic.CA1031.severity = none            # https://learn.microsoft.com/da-dk/dotnet/fundamentals/code-analysis/quality-rules/ca1031
 dotnet_diagnostic.CA1515.severity = none            # Consider making public types internal https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1515
 dotnet_diagnostic.CA1848.severity = none            # https://learn.microsoft.com/da-dk/dotnet/fundamentals/code-analysis/quality-rules/ca1848

sample/src/Demo.Domain/Extensions/ApplicationBuilderExtensions.cs

@@ -5,9 +5,7 @@ public static class ApplicationBuilderExtensions
     public static IApplicationBuilder InitializeDatabase(this IApplicationBuilder app)
     {
         using var serviceScope = app.ApplicationServices.CreateScope();
-        var serviceProvider = serviceScope.ServiceProvider;
-        var options = serviceProvider.GetRequiredService<DbContextOptions<DemoDbContext>>();
-        using var context = new DemoDbContext(options);
+        var context = serviceScope.ServiceProvider.GetRequiredService<DemoDbContext>();
 
         if (context.Users.Any())
         {

sample/src/Demo.Domain/Extensions/ServiceCollectionExtensions.cs

@@ -17,20 +17,22 @@ public static IServiceCollection ConfigureDomainServices(
 
     public static void DefineHandlersAndServices(this IServiceCollection services)
     {
-        services.AddSingleton<IGetUsersHandler, GetUsersHandler>();
-        services.AddSingleton<ICreateUserHandler, CreateUserHandler>();
-        services.AddSingleton<IGetUserByIdHandler, GetUserByIdHandler>();
-        services.AddSingleton<IGetUserByEmailHandler, GetUserByEmailHandler>();
-        services.AddSingleton<IUpdateUserByIdHandler, UpdateUserByIdHandler>();
-        services.AddSingleton<IDeleteUserByIdHandler, DeleteUserByIdHandler>();
+        services.AddScoped<IGetUsersHandler, GetUsersHandler>();
+        services.AddScoped<ICreateUserHandler, CreateUserHandler>();
+        services.AddScoped<IGetUserByIdHandler, GetUserByIdHandler>();
+        services.AddScoped<IGetUserByEmailHandler, GetUserByEmailHandler>();
+        services.AddScoped<IUpdateUserByIdHandler, UpdateUserByIdHandler>();
+        services.AddScoped<IDeleteUserByIdHandler, DeleteUserByIdHandler>();
     }
 
     private static void SetupStorage(this IServiceCollection services)
     {
         // Add DbContext with In-Memory Database
+        // Note: Using a fixed database name so data persists across requests
+        // contextLifetime: Scoped for thread-safety, optionsLifetime: Singleton for test compatibility
         services.AddDbContext<DemoDbContext>(
-            options => options.UseInMemoryDatabase(
-                Guid.NewGuid().ToString()),
-            ServiceLifetime.Singleton);
+            options => options.UseInMemoryDatabase("DemoDatabase"),
+            contextLifetime: ServiceLifetime.Scoped,
+            optionsLifetime: ServiceLifetime.Singleton);
     }
 }

sample/src/Demo.Domain/MapsterConfig.cs

@@ -4,10 +4,29 @@ public static class MapsterConfig
 {
     public static void Register()
     {
+        // Map Country -> CountryEntity
+        TypeAdapterConfig<Country, CountryEntity>
+            .NewConfig();
+
+        // Map Address -> AddressEntity
+        TypeAdapterConfig<Address, AddressEntity>
+            .NewConfig();
+
+        // Map CreateUserRequest -> UserEntity with safe Uri parsing
         TypeAdapterConfig<CreateUserRequest, UserEntity>
             .NewConfig()
-            .Map(dest => dest.HomePage, src => src.HomePage != null ? new Uri(src.HomePage) : null);
+            .Map(dest => dest.HomePage, src => TryCreateUri(src.HomePage));
 
         TypeAdapterConfig.GlobalSettings.Compile();
     }
+
+    private static Uri? TryCreateUri(string? url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return null;
+        }
+
+        return Uri.TryCreate(url, UriKind.Absolute, out var uri) ? uri : null;
+    }
 }

sample/src/Demo.Domain/Users/Handlers/CreateUserHandler.cs

@@ -22,10 +22,17 @@ public async Task<Results<CreatedAtRoute, BadRequest<string>, Conflict<string>>>
 
         dbContext.Users.Add(userEntity);
 
-        var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
+        try
+        {
+            var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
 
-        return saveChangesResult > 0
-            ? TypedResults.CreatedAtRoute(Api.Contracts.Names.UserDefinitionNames.GetUserById, new { userId })
-            : TypedResults.BadRequest("Could not create user.");
+            return saveChangesResult > 0
+                ? TypedResults.CreatedAtRoute(Api.Contracts.Names.UserDefinitionNames.GetUserById, new { userId })
+                : TypedResults.BadRequest("Could not create user.");
+        }
+        catch (DbUpdateException)
+        {
+            return TypedResults.BadRequest("Could not create user due to a database error.");
+        }
     }
 }

sample/src/Demo.Domain/Users/Handlers/DeleteUserByIdHandler.cs

@@ -25,10 +25,17 @@ public async Task<Results<NoContent, BadRequest<string>, NotFound>> ExecuteAsync
 
         dbContext.Users.Remove(user);
 
-        var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
+        try
+        {
+            var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
 
-        return saveChangesResult > 0
-            ? TypedResults.NoContent()
-            : TypedResults.BadRequest($"Could not delete user with id '{parameters.UserId}'.");
+            return saveChangesResult > 0
+                ? TypedResults.NoContent()
+                : TypedResults.BadRequest($"Could not delete user with id '{parameters.UserId}'.");
+        }
+        catch (DbUpdateException)
+        {
+            return TypedResults.BadRequest($"Could not delete user with id '{parameters.UserId}' due to a database error.");
+        }
     }
 }

sample/src/Demo.Domain/Users/Handlers/UpdateUserByIdHandler.cs

@@ -67,11 +67,22 @@ public async Task<Results<Ok<User>, BadRequest<string>, NotFound, Conflict<strin
             user.WorkAddress = MapAddress(parameters.Request.WorkAddress);
         }
 
-        var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
+        try
+        {
+            var saveChangesResult = await dbContext.SaveChangesAsync(cancellationToken);
 
-        return saveChangesResult > 0
-            ? TypedResults.Ok(user.Adapt<User>())
-            : TypedResults.BadRequest("Could not update user.");
+            return saveChangesResult > 0
+                ? TypedResults.Ok(user.Adapt<User>())
+                : TypedResults.BadRequest("Could not update user.");
+        }
+        catch (DbUpdateConcurrencyException)
+        {
+            return TypedResults.Conflict("The user was modified by another request. Please retry.");
+        }
+        catch (DbUpdateException)
+        {
+            return TypedResults.BadRequest("Could not update user due to a database error.");
+        }
     }
 
     private static bool IsModified(