Using graphql to edit comments

Author: StanleyGoldman

src/GitHub.Exports.Reactive/Services/IPullRequestSession.cs

@@ -156,9 +156,9 @@ Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// <summary>
         /// Edit a PR review comment reply.
         /// </summary>
-        /// <param name="number">The number of the pull request comment</param>
+        /// <param name="commentNodeId">The node id of the pull request comment</param>
         /// <param name="body">The replacement comment body.</param>
         /// <returns>A comment model.</returns>
-        Task<IPullRequestReviewCommentModel> EditComment(int number, string body);
+        Task<IPullRequestReviewCommentModel> EditComment(string commentNodeId, string body);
     }
 }

src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs

@@ -320,13 +320,13 @@ Task DeleteComment(
         /// <param name="localRepository">The local repository.</param>
         /// <param name="remoteRepositoryOwner">The owner of the repository fork to delete from.</param>
         /// <param name="user">The user deleting the comment.</param>
-        /// <param name="number">The pull request comment number.</param>
+        /// <param name="commentNodeId">The pull request comment node id.</param>
         /// <param name="body">The replacement comment body.</param>
         /// <returns>A model representing the edited comment.</returns>
         Task<PullRequestReviewCommentModel> EditComment(ILocalRepositoryModel localRepository,
             string remoteRepositoryOwner,
             IAccount user,
-            int number,
+            string commentNodeId,
             string body);
     }
 }

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -178,14 +178,13 @@ await service.DeleteComment(
         }
 
         /// <inheritdoc/>
-        public async Task<IPullRequestReviewCommentModel> EditComment(
-            int number, string body)
+        public async Task<IPullRequestReviewCommentModel> EditComment(string commentNodeId, string body)
         {
             var model = await service.EditComment(
                 LocalRepository,
                 RepositoryOwner,
                 User,
-                number,
+                commentNodeId,
                 body);
 
             await ReplaceComment(model);

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -18,6 +18,7 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Projection;
 using Octokit.GraphQL;
+using Octokit.GraphQL.Core;
 using Octokit.GraphQL.Model;
 using ReactiveUI;
 using Serilog;
@@ -622,33 +623,39 @@ await apiClient.DeletePullRequestReviewComment(
         public async Task<PullRequestReviewCommentModel> EditComment(ILocalRepositoryModel localRepository,
             string remoteRepositoryOwner,
             IAccount user,
-            int number,
+            string commentNodeId,
             string body)
         {
             var address = HostAddress.Create(localRepository.CloneUrl.Host);
-            var apiClient = await apiClientFactory.Create(address);
-
-            var result = await apiClient.EditPullRequestReviewComment(
-                remoteRepositoryOwner,
-                localRepository.Name,
-                number,
-                body);
-
-            await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentEdit);
+            var graphql = await graphqlFactory.CreateConnection(address);
 
-            return new PullRequestReviewCommentModel
+            var updatePullRequestReviewCommentInput = new UpdatePullRequestReviewCommentInput
             {
-                Body = result.Body,
-                CommitId = result.CommitId,
-                DiffHunk = result.DiffHunk,
-                Id = result.Id,
-                OriginalCommitId = result.OriginalCommitId,
-                OriginalPosition = result.OriginalPosition,
-                Path = result.Path,
-                Position = result.Position,
-                CreatedAt = result.CreatedAt,
-                User = user,
+                Body = body,
+                PullRequestReviewCommentId = commentNodeId
             };
+
+            var editComment = new Mutation().UpdatePullRequestReviewComment(updatePullRequestReviewCommentInput)
+                .Select(x => new PullRequestReviewCommentModel
+                {
+                    Id = x.PullRequestReviewComment.DatabaseId.Value,
+                    NodeId = x.PullRequestReviewComment.Id,
+                    Body = x.PullRequestReviewComment.Body,
+                    CommitId = x.PullRequestReviewComment.Commit.Oid,
+                    Path = x.PullRequestReviewComment.Path,
+                    Position = x.PullRequestReviewComment.Position,
+                    CreatedAt = x.PullRequestReviewComment.CreatedAt.Value,
+                    DiffHunk = x.PullRequestReviewComment.DiffHunk,
+                    OriginalPosition = x.PullRequestReviewComment.OriginalPosition,
+                    OriginalCommitId = x.PullRequestReviewComment.OriginalCommit.Oid,
+                    PullRequestReviewId = x.PullRequestReviewComment.PullRequestReview.DatabaseId.Value,
+                    User = user,
+                    IsPending = false,
+                });
+
+            var result = await graphql.Run(editComment);
+            await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentPost);
+            return result;
         }
 
         int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk> diff)

src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs

@@ -168,7 +168,7 @@ async Task DoCommitEdit(object unused)
                 }
                 else
                 {
-                    model = await Thread.EditComment.ExecuteAsyncTask(new Tuple<int, string>(Id, Body));
+                    model = await Thread.EditComment.ExecuteAsyncTask(new Tuple<string, string>(NodeId, Body));
                 }
 
                 Id = model.Id;

src/GitHub.InlineReviews/ViewModels/InlineCommentThreadViewModel.cs

@@ -81,7 +81,7 @@ async Task<ICommentModel> DoEditComment(object parameter)
         {
             Guard.ArgumentNotNull(parameter, nameof(parameter));
 
-            var item = (Tuple<int, string>)parameter;
+            var item = (Tuple<string, string>)parameter;
             return await Session.EditComment(item.Item1, item.Item2);
         }