Expand IdentityItemData to have more properties available

Author: satano

Directory.Packages.props

@@ -40,6 +40,7 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
     <PackageVersion Include="OxyPlot.Core" Version="2.2.0" />
     <PackageVersion Include="OxyPlot.ImageSharp" Version="2.2.0" />
+    <PackageVersion Include="Riok.Mapperly" Version="4.1.0" />
     <PackageVersion Include="Serilog" Version="4.0.1" />
     <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />

src/MigrationTools.Clients.TfsObjectModel/MigrationTools.Clients.TfsObjectModel.csproj

@@ -40,6 +40,7 @@
     <PackageReference Include="OpenTelemetry.Exporter.Console" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+    <PackageReference Include="Riok.Mapperly" />
     <PackageReference Include="TfsUrlParser" />
   </ItemGroup>
 

src/MigrationTools.Clients.TfsObjectModel/Processors/TfsExportUsersForMappingProcessor.cs

@@ -65,14 +65,14 @@ protected override void InternalExecute()
                 Log.LogInformation("Found {usersToMap} total mapped", usersToMap.Count);
             }
 
-            usersToMap = usersToMap.Where(x => x.Source.FriendlyName != x.Target?.FriendlyName).ToList();
+            usersToMap = usersToMap.Where(x => x.Source.DisplayName != x.Target?.DisplayName).ToList();
             Log.LogInformation("Filtered to {usersToMap} total viable mappings", usersToMap.Count);
             Dictionary<string, string> usermappings = [];
             foreach (IdentityMapData userMapping in usersToMap)
             {
-                // We cannot use ToDictionary(), because there can be multiple users with the same friendly name and so
+                // We cannot use ToDictionary(), because there can be multiple users with the same display name and so
                 // it would throw with duplicate key. This way we just overwrite the value – last item in source wins.
-                usermappings[userMapping.Source.FriendlyName] = userMapping.Target?.FriendlyName;
+                usermappings[userMapping.Source.DisplayName] = userMapping.Target?.DisplayName;
             }
             System.IO.File.WriteAllText(CommonTools.UserMapping.Options.UserMappingFile, JsonConvert.SerializeObject(usermappings, Formatting.Indented));
             Log.LogInformation("Writen to: {LocalExportJsonFile}", CommonTools.UserMapping.Options.UserMappingFile);

src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs

@@ -8,6 +8,7 @@
 using MigrationTools.DataContracts;
 using MigrationTools.Processors.Infrastructure;
 using MigrationTools.Tools.Infrastructure;
+using Riok.Mapperly.Abstractions;
 
 namespace MigrationTools.Tools
 {
@@ -23,6 +24,7 @@ public TfsUserMappingTool(IOptions<TfsUserMappingToolOptions> options, IServiceP
         }
 
         private readonly CaseInsensitiveStringComparer _workItemNameComparer = new();
+        private readonly TfsUserMappingToolMapper _mapper = new();
 
         private HashSet<string> GetUsersFromWorkItems(List<WorkItemData> workitems, List<string> identityFieldsToCheck)
         {
@@ -76,7 +78,7 @@ private Dictionary<string, string> GetMappingFileData()
                 try
                 {
                     var fileMaps = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IdentityMapData>>(fileData);
-                    _UserMappings = fileMaps.ToDictionary(x => x.Source.FriendlyName, x => x.Target?.FriendlyName);
+                    _UserMappings = fileMaps.ToDictionary(x => x.Source.DisplayName, x => x.Target?.DisplayName);
                 }
                 catch (Exception)
                 {
@@ -106,11 +108,7 @@ private List<IdentityItemData> GetUsersListFromServer(IGroupSecurityService gss)
                     else if ((identity.Type == IdentityType.WindowsUser) || (identity.Type == IdentityType.UnknownIdentityType))
                     {
                         // UnknownIdentityType is set for users in Azure Entra ID.
-                        foundUsers.Add(new IdentityItemData()
-                        {
-                            FriendlyName = identity.DisplayName,
-                            AccountName = identity.AccountName
-                        });
+                        foundUsers.Add(_mapper.IdentityToIdentityItemData(identity));
                     }
                     else
                     {
@@ -154,7 +152,7 @@ public List<IdentityMapData> GetUsersInSourceMappedToTargetForWorkItems(TfsProce
                 Log.LogDebug($"TfsUserMappingTool::GetUsersInSourceMappedToTargetForWorkItems [workItemUsers|{workItemUsers.Count}]");
                 List<IdentityMapData> mappedUsers = GetUsersInSourceMappedToTarget(processor);
                 Log.LogDebug($"TfsUserMappingTool::GetUsersInSourceMappedToTargetForWorkItems [mappedUsers|{mappedUsers.Count}]");
-                return mappedUsers.Where(x => workItemUsers.Contains(x.Source.FriendlyName)).ToList();
+                return mappedUsers.Where(x => workItemUsers.Contains(x.Source.DisplayName)).ToList();
             }
             else
             {
@@ -176,4 +174,12 @@ public int GetHashCode(string obj)
             return obj.GetHashCode();
         }
     }
+
+    [Mapper]
+    internal partial class TfsUserMappingToolMapper
+    {
+#pragma warning disable RMG020 // Source member is not mapped to any target member
+        public partial IdentityItemData IdentityToIdentityItemData(Identity identity);
+#pragma warning restore RMG020 // Source member is not mapped to any target member
+    }
 }

src/MigrationTools/DataContracts/IdentityItemData.cs

@@ -2,8 +2,11 @@
 {
     public class IdentityItemData
     {
-        public string FriendlyName { get; set; }
+        public string Sid { get; set; }
+        public string DisplayName { get; set; }
+        public string Domain { get; set; }
         public string AccountName { get; set; }
+        public string MailAddress { get; set; }
     }
 
     public class IdentityMapData