Merge branch 'dev' into feature/ULITP-5407

Author: HussRasit

src/KeeperData.Application/Orchestration/Imports/Sam/Holdings/Steps/SamHoldingImportGoldMappingStep.cs

@@ -28,9 +28,8 @@ protected override async Task ExecuteCoreAsync(SamHoldingImportContext context,
     {
         if (context.SilverHoldings.Count > 0)
         {
-            var representative = context.SilverHoldings.Any(x => x.HoldingStatus == HoldingStatusType.Active.GetDescription())
-            ? context.SilverHoldings.Where(x => x.HoldingStatus == HoldingStatusType.Active.GetDescription()).OrderByDescending(h => h.LastUpdatedDate).First()
-            : context.SilverHoldings.OrderByDescending(h => h.LastUpdatedDate).First();
+            // Prefer SAM Holding over Common Land when selecting representative
+            var representative = SamHoldingMapper.SelectRepresentativeHolding(context.SilverHoldings);
 
             var existingHoldingFilter = Builders<SiteDocument>.Filter.ElemMatch(
                 x => x.Identifiers,
@@ -70,7 +69,7 @@ protected override async Task ExecuteCoreAsync(SamHoldingImportContext context,
                 siteTypeDerivedCodeLookupService,
                 cancellationToken);
 
-            await EnrichWithCommonLandDataAsync(context, representative, cancellationToken);
+            await EnrichWithCommonLandDataAsync(context, context.SilverHoldings, cancellationToken);
 
             logger.LogInformation("Associated main sites queued for update: {Count} for CPH {Cph}",
                 context.AssociatedMainSites?.Count ?? 0, context.Cph);
@@ -87,14 +86,21 @@ protected override async Task ExecuteCoreAsync(SamHoldingImportContext context,
         }
     }
 
-    private async Task EnrichWithCommonLandDataAsync(SamHoldingImportContext context, SamHoldingDocument representative, CancellationToken cancellationToken)
+    private async Task EnrichWithCommonLandDataAsync(SamHoldingImportContext context, List<SamHoldingDocument> silverHoldings, CancellationToken cancellationToken)
     {
         var goldSite = context.GoldSite;
         if (goldSite == null) return;
 
-        goldSite.LocalAuthorityName = representative.LocalAuthorityName;
+        // Merge LocalAuthorityName - prefer non-null value from any holding
+        goldSite.LocalAuthorityName = silverHoldings
+            .Select(h => h.LocalAuthorityName)
+            .FirstOrDefault(name => !string.IsNullOrWhiteSpace(name));
 
-        goldSite.AssociatedMainHoldings = representative.AssociatedMainHoldings
+        // Merge AssociatedMainHoldings from all holdings, removing duplicates
+        var allMainHoldings = silverHoldings
+            .SelectMany(h => h.AssociatedMainHoldings)
+            .GroupBy(r => r.HoldingIdentifier)
+            .Select(g => g.OrderByDescending(r => r.StartDate).First())
             .Select(r => new AssociatedHoldingDocument
             {
                 HoldingIdentifier = r.HoldingIdentifier,
@@ -104,13 +110,17 @@ private async Task EnrichWithCommonLandDataAsync(SamHoldingImportContext context
             })
             .ToList();
 
+        goldSite.AssociatedMainHoldings = allMainHoldings;
+
         if (goldSite.AssociatedMainHoldings?.Count > 0)
         {
-            await FindAndUpdateMainSiteIfExists(context, representative, goldSite.AssociatedMainHoldings, cancellationToken);
+            // Get the CPH from any holding (they all have the same CPH)
+            var cph = silverHoldings.First().CountyParishHoldingNumber;
+            await FindAndUpdateMainSiteIfExists(context, cph, goldSite.AssociatedMainHoldings, cancellationToken);
         }
     }
 
-    private async Task FindAndUpdateMainSiteIfExists(SamHoldingImportContext context, SamHoldingDocument representative, List<AssociatedHoldingDocument> mainHoldings, CancellationToken cancellationToken)
+    private async Task FindAndUpdateMainSiteIfExists(SamHoldingImportContext context, string commonCph, List<AssociatedHoldingDocument> mainHoldings, CancellationToken cancellationToken)
     {
         foreach (var mainHolding in mainHoldings)
         {
@@ -133,7 +143,7 @@ private async Task FindAndUpdateMainSiteIfExists(SamHoldingImportContext context
 
             var commonForMain = new AssociatedHoldingDocument
             {
-                HoldingIdentifier = representative.CountyParishHoldingNumber,
+                HoldingIdentifier = commonCph,
                 ContiguousFlag = mainHolding.ContiguousFlag,
                 StartDate = mainHolding.StartDate,
                 EndDate = mainHolding.EndDate

src/KeeperData.Application/Orchestration/Imports/Sam/Holdings/Steps/SamHoldingImportSilverMappingStep.cs

@@ -25,7 +25,10 @@ protected override async Task ExecuteCoreAsync(SamHoldingImportContext context,
             countryIdentifierLookupService.FindAsync,
             cancellationToken);
 
-        var commonLandHoldings = SamCommonLandMapper.ToSilver(context.RawCommonLandsByCommonCph);
+        var commonLandHoldings = await SamCommonLandMapper.ToSilver(
+            context.RawCommonLandsByCommonCph,
+            countryIdentifierLookupService.FindAsync,
+            cancellationToken);
         if (commonLandHoldings.Count > 0)
         {
             context.SilverHoldings.AddRange(commonLandHoldings);

src/KeeperData.Application/Orchestration/Imports/Sam/Mappings/SamCommonLandMapper.cs

@@ -10,7 +10,10 @@ public static class SamCommonLandMapper
     private const string CommonLandSiteTypeCode = "CL";
     private const string CommonLandBusinessUsage = "Common Land";
 
-    public static List<SamHoldingDocument> ToSilver(List<SamCommonLand> rawCommonLands)
+    public static async Task<List<SamHoldingDocument>> ToSilver(
+        List<SamCommonLand> rawCommonLands,
+        Func<string?, string?, CancellationToken, Task<(string? countryId, string? countryCode, string? countryName)>> resolveCountry,
+        CancellationToken cancellationToken)
     {
         if (rawCommonLands == null || rawCommonLands.Count == 0)
             return [];
@@ -33,6 +36,8 @@ public static List<SamHoldingDocument> ToSilver(List<SamCommonLand> rawCommonLan
                 });
             }
 
+            var (countryId, countryCode, _) = await resolveCountry(representative.COUNTRY, null, cancellationToken);
+
             var holding = new SamHoldingDocument
             {
                 LastUpdatedBatchId = representative.BATCH_ID,
@@ -64,10 +69,11 @@ public static List<SamHoldingDocument> ToSilver(List<SamCommonLand> rawCommonLan
                     {
                         IdentifierId = Guid.NewGuid().ToString(),
                         AddressLine = representative.ADDRESS_LINE_1,
-                        AddressLocality = representative.ADDRESS_LINE_2,
-                        AddressStreet = representative.ADDRESS_LINE_3,
+                        AddressStreet = representative.ADDRESS_LINE_2,
+                        AddressTown = representative.ADDRESS_LINE_3,
                         AddressPostCode = representative.POSTCODE,
-                        CountryCode = representative.COUNTRY
+                        CountryCode = countryCode,
+                        CountryIdentifier = countryId
                     }
                 }
             };