Ensure that fetched Comments include the renderedBody in HTML instead of ADF only

Author: Alexander-Hjelm

src/WorkItemMigrator/JiraExport/JiraItem.cs

@@ -220,16 +220,14 @@ private static void HandleAttachmentChange(JiraChangeItem item, List<RevisionAct
 
         private static List<JiraRevision> BuildCommentRevisions(JiraItem jiraItem, IJiraProvider jiraProvider)
         {
-            var renderedFields = jiraItem.RemoteIssue.SelectToken("$.renderedFields.comment.comments");
             var comments = jiraProvider.GetCommentsByItemKey(jiraItem.Key);
             return comments.Select((c, i) =>
             {
-                var rc = renderedFields.SelectToken($"$.[{i}].body");
-                return BuildCommentRevision(c, rc, jiraItem);
+                return BuildCommentRevision(c, c.RenderedBody, jiraItem);
             }).ToList();
         }
 
-        private static JiraRevision BuildCommentRevision(Comment c, JToken rc, JiraItem jiraItem)
+        private static JiraRevision BuildCommentRevision(Comment c, string rc, JiraItem jiraItem)
         {
             var author = "NoAuthorDefined";
             if (c.AuthorUser is null)
@@ -252,7 +250,7 @@ private static JiraRevision BuildCommentRevision(Comment c, JToken rc, JiraItem
             {
                 Author = author,
                 Time = c.CreatedDate.Value,
-                Fields = new Dictionary<string, object>() { { "comment", c.Body }, { "comment$Rendered", rc.Value<string>() } },
+                Fields = new Dictionary<string, object>() { { "comment", c.Body }, { "comment$Rendered", rc } },
                 AttachmentActions = new List<RevisionAction<JiraAttachment>>(),
                 LinkActions = new List<RevisionAction<JiraLink>>()
             };

src/WorkItemMigrator/JiraExport/JiraProvider.cs

@@ -111,7 +111,9 @@ public IssueLinkType GetLinkType(string linkTypeString, string targetItemKey, ou
 
         public IEnumerable<Comment> GetCommentsByItemKey(string itemKey)
         {
-            return _jiraServiceWrapper.Issues.GetCommentsAsync(itemKey).Result;
+            var options = new CommentQueryOptions();
+            options.Expand.Add("renderedBody");
+            return _jiraServiceWrapper.Issues.GetCommentsAsync(itemKey, options).Result;
         }
 
         public CustomField GetCustomField(string fieldName)