[preview] Add image attacmiebts to post processor (#2075)

nkdAgility · Jun 2, 2024 · 3874b5d · 3874b5d
2 parents 248c127 + 3041538
commit 3874b5d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/configuration.json b/configuration.json
@@ -18,7 +18,7 @@
     "$type": "TfsTeamProjectConfig",
     "Collection": "https://dev.azure.com/nkdagility-preview/",
     "Project": "migrationTest5",
-    "ReflectedWorkItemIDFieldName": "Custom.ReflectedWorkItemId",
+    "ReflectedWorkItemIDFieldName": "nkdScrum.ReflectedWorkItemId",
     "AllowCrossProjectLinking": false,
     "AuthenticationMode": "AccessToken",
     "PersonalAccessToken": "",
@@ -112,7 +112,7 @@
   "Processors": [
     {
       "$type": "WorkItemMigrationConfig",
-      "Enabled": true,
+      "Enabled": false,
       "UpdateCreatedDate": true,
       "UpdateCreatedBy": true,
       "WIQLQuery": "SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = @TeamProject AND [System.WorkItemType] NOT IN ('Test Suite', 'Test Plan','Shared Steps','Shared Parameter','Feedback Request') ORDER BY [System.ChangedDate] desc",
@@ -127,10 +127,18 @@
       "SkipRevisionWithInvalidIterationPath": false,
       "SkipRevisionWithInvalidAreaPath": false
     },
+    {
+      "$type": "WorkItemPostProcessingConfig",
+      "Enabled": true,
+      "WIQLQuery": "SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = @TeamProject AND [System.WorkItemType] NOT IN ('Test Suite', 'Test Plan','Shared Steps','Shared Parameter','Feedback Request') ORDER BY [System.ChangedDate] desc",
+      "WorkItemCreateRetryLimit": 5,
+      "FilterWorkItemsThatAlreadyExistInTarget": false,
+      "PauseAfterEachWorkItem": false
+    },
     {
       "$type": "ExportUsersForMappingConfig",
       "Enabled": false,
-      "WIQLQuery": "SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = @TeamProject AND [System.WorkItemType] NOT IN ('Program', 'Portfolio', 'Test Suite', 'Test Plan','Shared Steps','Shared Parameter','Feedback Request') ORDER BY [System.ChangedDate] desc",
+      "WIQLQuery": "SELECT [System.Id] FROM WorkItems WHERE [System.TeamProject] = @TeamProject AND [System.WorkItemType] NOT IN ('Test Suite', 'Test Plan','Shared Steps','Shared Parameter','Feedback Request') ORDER BY [System.ChangedDate] desc",
       "OnlyListUsersInWorkItems": true
     }
   ],

diff --git a/src/MigrationTools.Clients.AzureDevops.ObjectModel/Enrichers/TfsGitRepositoryEnricher.cs b/src/MigrationTools.Clients.AzureDevops.ObjectModel/Enrichers/TfsGitRepositoryEnricher.cs
@@ -161,6 +161,7 @@ public override int Enrich(WorkItemData sourceWorkItem, WorkItemData targetWorkI
                                 case "Fixed in Commit":
                                     newLink = new ExternalLink(((TfsWorkItemMigrationClient)Engine.Target.WorkItems).Store.RegisteredLinkTypes[ArtifactLinkIds.Commit],
                                         $"vstfs:///git/commit/{targetRepoInfo.GitRepo.ProjectReference.Id}%2f{targetRepoInfo.GitRepo.Id}%2f{sourceRepoInfo.CommitID}");
+                                    newLink.Comment = el.Comment;
                                     break;
 
                                 case "Pull Request":

diff --git a/src/VstsSyncMigrator.Core/Execution/MigrationContext/WorkItemPostProcessingContext.cs b/src/VstsSyncMigrator.Core/Execution/MigrationContext/WorkItemPostProcessingContext.cs
@@ -12,6 +12,7 @@
 using MigrationTools._EngineV1.DataContracts;
 using MigrationTools._EngineV1.Processors;
 using MigrationTools.DataContracts;
+using MigrationTools.Enrichers;
 
 namespace VstsSyncMigrator.Engine
 {
@@ -23,10 +24,17 @@ namespace VstsSyncMigrator.Engine
     public class WorkItemPostProcessingContext : MigrationProcessorBase
     {
         private WorkItemPostProcessingConfig _config;
+        private TfsWorkItemEmbededLinkEnricher _workItemEmbeddedLinkEnricher;
 
-        public WorkItemPostProcessingContext(IMigrationEngine engine, IServiceProvider services, ITelemetryLogger telemetry, ILogger<WorkItemPostProcessingContext> logger)
+        public WorkItemPostProcessingContext(
+            IMigrationEngine engine,
+            IServiceProvider services,
+            ITelemetryLogger telemetry,
+            TfsWorkItemEmbededLinkEnricher workItemEmbeddedLinkEnricher,
+            ILogger<WorkItemPostProcessingContext> logger)
             : base(engine, services, telemetry, logger)
         {
+            _workItemEmbeddedLinkEnricher = workItemEmbeddedLinkEnricher;
         }
 
         public override string Name
@@ -75,6 +83,8 @@ protected override void InternalExecute()
                     Log.LogInformation("...Exists");
                     TfsExtensions.ToWorkItem(targetFound).Open();
                     Engine.FieldMaps.ApplyFieldMappings(sourceWI, targetFound);
+                    _workItemEmbeddedLinkEnricher.Enrich(null, targetFound);
+                    _workItemEmbeddedLinkEnricher.Enrich(sourceWI, targetFound);
                     if (TfsExtensions.ToWorkItem(targetFound).IsDirty)
                     {
                         try