Merge branch 'main' into topic/exception-enhancement

MrHinsh · MrHinsh · commit 275bec8ce253 · 2024-10-03T08:22:49.000+01:00
diff --git a/configuration.json b/configuration.json
@@ -132,6 +132,18 @@
         "UpdateTeamSettings": true,
         "MigrateTeamCapacities": true,
         "Teams": [ "Team 1", "Team 2" ]
+      },
+      "TfsUserMappingTool": {
+        "Enabled": true,
+        "UserMappingFile": "C:\\temp\\userExport.json",
+        "IdentityFieldsToCheck": [
+          "System.AssignedTo",
+          "System.ChangedBy",
+          "System.CreatedBy",
+          "Microsoft.VSTS.Common.ActivatedBy",
+          "Microsoft.VSTS.Common.ResolvedBy",
+          "Microsoft.VSTS.Common.ClosedBy"
+        ]
       }
     },
     "Processors": [
diff --git a/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs b/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs
@@ -86,7 +86,12 @@ public void MapUserIdentityField(TfsProcessor processor, Field field)
 
         private Dictionary<string, string> GetMappingFileData()
         {
-            if (_UserMappings == null && System.IO.File.Exists(Options.UserMappingFile))
+            if (!System.IO.File.Exists(Options.UserMappingFile))
+            {
+                Log.LogError("TfsUserMappingTool::GetMappingFileData:: The UserMappingFile '{UserMappingFile}' cant be found! Provide a valid file or disable TfsUserMappingTool!", Options.UserMappingFile);
+                _UserMappings = new Dictionary<string, string>();
+            }
+            if (_UserMappings == null)
             {
                 var fileData = System.IO.File.ReadAllText(Options.UserMappingFile);
                 try
@@ -101,14 +106,7 @@ private Dictionary<string, string> GetMappingFileData()
                 }
 
             }
-            else
-            {
-                Log.LogError($"TfsUserMappingTool::GetMappingFileData::No User Mapping file Provided! Provide file or disable TfsUserMappingTool");
-                _UserMappings = new Dictionary<string, string>();
-            }
-
             return _UserMappings;
-
         }
 
         private List<IdentityItemData> GetUsersListFromServer(IGroupSecurityService gss)

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,12 @@ public void MapUserIdentityField(TfsProcessor processor, Field field)`
`86`	`86`
`87`	`87`	`private Dictionary<string, string> GetMappingFileData()`
`88`	`88`	`{`
`89`		`- if (_UserMappings == null && System.IO.File.Exists(Options.UserMappingFile))`
	`89`	`+ if (!System.IO.File.Exists(Options.UserMappingFile))`
	`90`	`+ {`
	`91`	`+ Log.LogError("TfsUserMappingTool::GetMappingFileData:: The UserMappingFile '{UserMappingFile}' cant be found! Provide a valid file or disable TfsUserMappingTool!", Options.UserMappingFile);`
	`92`	`+ _UserMappings = new Dictionary<string, string>();`
	`93`	`+ }`
	`94`	`+ if (_UserMappings == null)`
`90`	`95`	`{`
`91`	`96`	`var fileData = System.IO.File.ReadAllText(Options.UserMappingFile);`
`92`	`97`	`try`
`@@ -101,14 +106,7 @@ private Dictionary<string, string> GetMappingFileData()`
`101`	`106`	`}`
`102`	`107`
`103`	`108`	`}`
`104`		`- else`
`105`		`- {`
`106`		`- Log.LogError($"TfsUserMappingTool::GetMappingFileData::No User Mapping file Provided! Provide file or disable TfsUserMappingTool");`
`107`		`- _UserMappings = new Dictionary<string, string>();`
`108`		`- }`
`109`		`-`
`110`	`109`	`return _UserMappings;`
`111`		`-`
`112`	`110`	`}`
`113`	`111`
`114`	`112`	`private List<IdentityItemData> GetUsersListFromServer(IGroupSecurityService gss)`