Refactor address update logic; enforce single primary address

vip32 · vip32 · commit a42b675d6f28 · 2026-01-15T23:59:04.000+01:00
- Require exactly one primary address in update validation.
- Remove isPrimary from AddAddress; set primary separately.
- Refactor address update/removal to use functional style.
- Rename and improve address processing methods for clarity.
- Update BridgingIT.DevKit package versions.
- Minor doc and header improvements.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,16 +5,16 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="BridgingIT.DevKit.Application.JobScheduling" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Common.Mapping" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Common.Utilities.Xunit" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Domain" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Domain.CodeGen" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Infrastructure.EntityFramework" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Infrastructure.EntityFramework.SqlServer" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Presentation.Web" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Presentation.Web.JobScheduling" Version="10.0.2-preview.0.56" />
-    <PackageVersion Include="BridgingIT.DevKit.Presentation.Serilog" Version="10.0.2-preview.0.56" />
+    <PackageVersion Include="BridgingIT.DevKit.Application.JobScheduling" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Common.Mapping" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Common.Utilities.Xunit" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Domain" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Domain.CodeGen" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Infrastructure.EntityFramework" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Infrastructure.EntityFramework.SqlServer" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Presentation.Web" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Presentation.Web.JobScheduling" Version="10.0.2-preview.0.64" />
+    <PackageVersion Include="BridgingIT.DevKit.Presentation.Serilog" Version="10.0.2-preview.0.64" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="Dumpify" Version="0.6.6" />
     <PackageVersion Include="FluentAssertions.Web" Version="1.9.5" />
diff --git a/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerCreateCommandHandler.cs b/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerCreateCommandHandler.cs
@@ -102,8 +102,7 @@ private Result<CustomerCreateContext> CreateEntity(CustomerCreateContext ctx)
                             addressModel.Line2,
                             addressModel.PostalCode,
                             addressModel.City,
-                            addressModel.Country,
-                            addressModel.IsPrimary));
+                            addressModel.Country));
                     }
 
                     return r;
diff --git a/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerUpdateCommand.cs b/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerUpdateCommand.cs
@@ -36,8 +36,8 @@ public Validator()
 
             // Address validation rules
             this.RuleFor(c => c.Model.Addresses)
-                .Must(addresses => addresses == null || addresses.Count(a => a.IsPrimary) <= 1)
-                .WithMessage("Only one address can be marked as primary");
+                .Must(addresses => addresses == null || addresses.Count(a => a.IsPrimary) == 1)
+                .WithMessage("One address should be marked as primary");
 
             this.RuleForEach(c => c.Model.Addresses).ChildRules(address =>
             {
diff --git a/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerUpdateCommandHandler.cs b/src/Modules/CoreModule/CoreModule.Application/Commands/CustomerUpdateCommandHandler.cs
@@ -1,4 +1,4 @@
-﻿// MIT-License
+// MIT-License
 // Copyright BridgingIT GmbH - All Rights Reserved
 // Use of this source code is governed by an MIT-style license that can be
 // found in the LICENSE file at https://github.com/bridgingit/bitdevkit/license
@@ -56,7 +56,7 @@ await repository.FindOneResultAsync(CustomerId.Create(request.Model.Id), cancell
             .Bind(e => e.ChangeEmail(request.Model.Email))
             .Bind(e => e.ChangeBirthDate(request.Model.DateOfBirth))
             .Bind(e => e.ChangeStatus(request.Model.Status))
-            .Bind(e => this.ProcessAddressChanges(e, request.Model.Addresses))
+            .Bind(e => this.UpdateAddresses(e, request.Model.Addresses))
             .Tap(e => // set concurrency version for optimistic concurrency check
             {
                 e.ConcurrencyVersion = Guid.Parse(request.Model.ConcurrencyVersion);
@@ -74,78 +74,60 @@ await repository.UpdateResultAsync(e, ct), cancellationToken)
             .Log(logger, "Entity mapped to {@Model}", r => [r.Value]);
 
     /// <summary>
-    /// Processes address changes by comparing the incoming addresses with existing ones.
-    /// Removes addresses not in the request, adds new addresses, and updates existing addresses.
+    /// Processes address changes by comparing the specified addresses with existing ones.
+    /// Removes Customer addresses not in the specified addresses, adds new addresses and updates existing addresses.
     /// </summary>
     /// <param name="customer">The customer aggregate to update.</param>
-    /// <param name="requestAddresses">The addresses from the update request.</param>
+    /// <param name="addressModels">The addresses from the update request.</param>
     /// <returns>The updated customer wrapped in a Result.</returns>
-    private Result<Customer> ProcessAddressChanges(Customer customer, List<CustomerAddressModel> requestAddresses)
+    private Result<Customer> UpdateAddresses(Customer customer, List<CustomerAddressModel> addressModels)
     {
-        requestAddresses ??= [];
+        addressModels ??= [];
 
-        // Get current address IDs
-        var requestAddressIds = requestAddresses
-            .Where(a => !string.IsNullOrWhiteSpace(a.Id))
-            .Select(a => AddressId.Create(a.Id)).ToList();
+        // Extract valid address IDs from request using LINQ fluent style
+        var addressIds = addressModels
+            .Where(m => !string.IsNullOrWhiteSpace(m.Id))
+            .Select(m => AddressId.Create(m.Id)).ToList();
 
-        // Remove addresses not in request
-        var addressesToRemove = customer.Addresses.Select(a => a.Id).Except(requestAddressIds).ToList();
-        foreach (var addressId in addressesToRemove)
+        // Remove obsolete addresses - find and return first failure if any
+        var removeResult = customer.Addresses
+            .Select(a => a.Id).Except(addressIds)
+            .Select(customer.RemoveAddress).FirstOrDefault(r => r.IsFailure).Unwrap(); // TODO: use .Flatten()
+
+        // Early return on first failure using fluent When extension
+        if (removeResult.IsFailure)
         {
-            var result = customer.RemoveAddress(addressId);
-            if (result.IsFailure)
-            {
-                return result;
-            }
+            return removeResult;
         }
 
-        // Process each address in request
-        foreach (var addressModel in requestAddresses)
+        // Process each address: add new or update existing
+        foreach (var addressModel in addressModels)
         {
-            if (string.IsNullOrWhiteSpace(addressModel.Id))
-            {
-                // Add new address
-                var result = customer.AddAddress(
-                    addressModel.Name,
-                    addressModel.Line1,
-                    addressModel.Line2,
-                    addressModel.PostalCode,
-                    addressModel.City,
-                    addressModel.Country,
-                    addressModel.IsPrimary);
-
-                if (result.IsFailure)
-                {
-                    return result;
-                }
-            }
-            else
+            var result = ProcessAddress(customer, addressModel);
+            if (result.IsFailure)
             {
-                // Update existing address
-                var addressId = AddressId.Create(Guid.Parse(addressModel.Id));
-                var existingAddress = customer.Addresses.FirstOrDefault(a => a.Id == addressId);
-
-                if (existingAddress != null)
-                {
-                    var result = customer.ChangeAddress(
-                        addressId,
-                        addressModel.Name,
-                        addressModel.Line1,
-                        addressModel.Line2,
-                        addressModel.PostalCode,
-                        addressModel.City,
-                        addressModel.Country,
-                        addressModel.IsPrimary);
-
-                    if (result.IsFailure)
-                    {
-                        return result;
-                    }
-                }
+                return result;
             }
         }
 
-        return Result<Customer>.Success(customer);
+        // Set primary address if specified
+        return addressModels
+            .Find(m => m.IsPrimary)
+            .Match(
+                some: m => customer.SetPrimaryAddress(m.Id),
+                none: () => Result<Customer>.Success(customer));
+
+        Result<Customer> ProcessAddress(Customer customer, CustomerAddressModel model) =>
+            string.IsNullOrWhiteSpace(model.Id)
+                ? customer.AddAddress(
+                    model.Name, model.Line1, model.Line2,
+                    model.PostalCode, model.City, model.Country)
+                : customer.Addresses
+                    .Find(a => a.Id == AddressId.Create(model.Id))
+                    .Match(
+                        some: _ => customer.ChangeAddress(
+                            model.Id, model.Name, model.Line1, model.Line2,
+                            model.PostalCode, model.City, model.Country),
+                        none: () => Result<Customer>.Success(customer));
     }
 }
diff --git a/src/Modules/CoreModule/CoreModule.Domain/Model/CustomerAggregate/Customer.cs b/src/Modules/CoreModule/CoreModule.Domain/Model/CustomerAggregate/Customer.cs
@@ -5,6 +5,7 @@
 
 namespace BridgingIT.DevKit.Examples.GettingStarted.Modules.CoreModule.Domain.Model;
 
+using System.Net.Sockets;
 using BridgingIT.DevKit.Domain;
 
 /// <summary>
@@ -184,10 +185,10 @@ public Result<Customer> ChangeStatus(CustomerStatus status)
     /// <param name="country">The country name (required).</param>
     /// <param name="isPrimary">Indicates if this should be the primary address.</param>
     /// <returns>The current <see cref="Customer"/> instance for chaining.</returns>
-    public Result<Customer> AddAddress(string name, string line1, string line2, string postalCode, string city, string country, bool isPrimary = false)
+    public Result<Customer> AddAddress(string name, string line1, string line2, string postalCode, string city, string country)
     {
         return this.Change()
-            .Add(e => this.addresses, Address.Create(name, line1, line2, postalCode, city, country, isPrimary))
+            .Add(e => this.addresses, Address.Create(name, line1, line2, postalCode, city, country))
             .Register(e => new CustomerUpdatedDomainEvent(e))
             .Apply();
     }
@@ -196,34 +197,23 @@ public Result<Customer> AddAddress(string name, string line1, string line2, stri
     /// Removes an address from the customer's address collection.
     /// Registers a <see cref="CustomerUpdatedDomainEvent"/>.
     /// </summary>
-    /// <param name="addressId">The ID of the address to remove.</param>
+    /// <param name="id">The ID of the address to remove.</param>
     /// <returns>The current <see cref="Customer"/> instance for chaining.</returns>
-    public Result<Customer> RemoveAddress(AddressId addressId)
+    public Result<Customer> RemoveAddress(AddressId id)
     {
-        var address = this.addresses.FirstOrDefault(a => a.Id == addressId);
-        if (address == null)
-        {
-            return Result<Customer>.Failure($"Address with ID {addressId} not found");
-        }
-
-        this.addresses.Remove(address);
-
         return this.Change()
+            //.When(_ => id != null)
+            .RemoveById(e => this.addresses, id, errorMessage: "Address with specified ID not found")
             .Register(e => new CustomerUpdatedDomainEvent(e))
             .Apply();
     }
 
-    public Result<Customer> SetPrimaryAddress(AddressId addressId)
+    public Result<Customer> SetPrimaryAddress(AddressId id)
     {
         return this.Change()
-            .Ensure(_ => this.addresses.Any(a => a.Id == addressId), "Address with ID {addressId} not found")
-            .Execute(e =>
-            {
-                foreach (var addr in this.addresses)
-                {
-                    addr.SetPrimary(addr.Id == addressId);
-                }
-            })
+            //.When(_ => id != null)
+            .Ensure(_ => this.addresses.Any(a => a.Id == id), "Address with specified ID not found")
+            .Set(e => e.addresses, a => a.SetPrimary(a.Id == id))
             .Register(e => new CustomerUpdatedDomainEvent(e))
             .Apply();
     }
@@ -232,33 +222,57 @@ public Result<Customer> SetPrimaryAddress(AddressId addressId)
     /// Updates an existing address with new values.
     /// Registers a <see cref="CustomerUpdatedDomainEvent"/>.
     /// </summary>
-    /// <param name="addressId">The ID of the address to update.</param>
+    /// <param name="id">The ID of the address to update.</param>
     /// <param name="name">The new name/label.</param>
     /// <param name="line1">The new first line.</param>
     /// <param name="line2">The new second line.</param>
     /// <param name="postalCode">The new postal code.</param>
     /// <param name="city">The new city.</param>
     /// <param name="country">The new country.</param>
     /// <returns>The current <see cref="Customer"/> instance for chaining.</returns>
-    public Result<Customer> ChangeAddress(AddressId addressId, string name, string line1, string line2, string postalCode, string city, string country)
+    public Result<Customer> ChangeAddress(AddressId id, string name, string line1, string line2, string postalCode, string city, string country)
     {
-        var address = this.addresses.FirstOrDefault(a => a.Id == addressId);
+        var address = this.addresses.FirstOrDefault(a => a.Id == id);
         if (address == null)
         {
-            return Result<Customer>.Failure($"Address with ID {addressId} not found");
+            return Result<Customer>.Failure("Address with specified ID not found");
         }
 
         return address.Change()
-            .Ensure(_ => address != null, "Address with ID {addressId} not found")
-            //.Ensure(_ => this.addresses.Any(a => a.Id == addressId), "Address with ID {addressId} not found")
+            .Ensure(_ => address != null, "Address with specified ID not found")
+            //.Ensure(_ => this.addresses.Any(a => a.Id == addressId), "Address with specified ID not found")
             .Set(e => e.ChangeName(name))
             .Set(e => e.ChangeLine1(line1))
             .Set(e => e.ChangeLine2(line2))
             .Set(e => e.ChangePostalCode(postalCode))
             .Set(e => e.ChangeCity(city))
             .Set(e => e.ChangeCountry(country))
             .Register(e => new CustomerUpdatedDomainEvent(this))
-            .Apply();
+            .Apply().Wrap(this);
+
+        // return customer.Change()
+        //     .Register(e => new CustomerUpdatedDomainEvent(this))
+        //     .Select(e => e.addresses.FirstOrDefault(a => a.Id == id), "Address with specified ID not found") // change to address context
+        //     .Set(a => a.ChangeName(name))
+        //     .Set(a => a.ChangeLine1(line1))
+        //     .Set(a => a.ChangeLine2(line2))
+        //     .Set(a => a.ChangePostalCode(postalCode))
+        //     .Set(a => a.ChangeCity(city))
+        //     .Set(a => a.ChangeCountry(country))
+        //     .Apply();
+
+        // return customer.Change()
+        //     .Ensure(_ => this.addresses.Any(a => a.Id == id), "Address with specified ID not found")
+        //     .Select(e => e.addresses.FirstOrDefault(a => a.Id == id) // change to address context
+        //         .Change()
+        //             .Set(a => a.ChangeName(name))
+        //             .Set(a => a.ChangeLine1(line1))
+        //             .Set(a => a.ChangeLine2(line2))
+        //             .Set(a => a.ChangePostalCode(postalCode))
+        //             .Set(a => a.ChangeCity(city))
+        //             .Set(a => a.ChangeCountry(country)).Apply())
+        //     .Register(e => new CustomerUpdatedDomainEvent(this))
+        //     .Apply();
 
         // var nameResult = address.ChangeName(name);
         // if (nameResult.IsFailure)
@@ -296,8 +310,8 @@ public Result<Customer> ChangeAddress(AddressId addressId, string name, string l
         //     return countryResult.Unwrap();
         // }
 
-    //     return this.Change()
-    //         .Register(e => new CustomerUpdatedDomainEvent(e))
-    //         .Apply();
-     }
-}
+        //     return this.Change()
+        //         .Register(e => new CustomerUpdatedDomainEvent(e))
+        //         .Apply();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ private Result<CustomerCreateContext> CreateEntity(CustomerCreateContext ctx)`
`102`	`102`	`addressModel.Line2,`
`103`	`103`	`addressModel.PostalCode,`
`104`	`104`	`addressModel.City,`
`105`		`- addressModel.Country,`
`106`		`- addressModel.IsPrimary));`
	`105`	`+ addressModel.Country));`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`return r;`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public Validator()`
`36`	`36`
`37`	`37`	`// Address validation rules`
`38`	`38`	`this.RuleFor(c => c.Model.Addresses)`
`39`		`- .Must(addresses => addresses == null \|\| addresses.Count(a => a.IsPrimary) <= 1)`
`40`		`- .WithMessage("Only one address can be marked as primary");`
	`39`	`+ .Must(addresses => addresses == null \|\| addresses.Count(a => a.IsPrimary) == 1)`
	`40`	`+ .WithMessage("One address should be marked as primary");`
`41`	`41`
`42`	`42`	`this.RuleForEach(c => c.Model.Addresses).ChildRules(address =>`
`43`	`43`	`{`