Tying in a lot of the delete comment functionality

Author: StanleyGoldman

src/GitHub.App/Api/ApiClient.cs

@@ -110,6 +110,14 @@ public IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(
             return gitHubClient.PullRequest.ReviewComment.CreateReply(owner, name, number, comment);
         }
 
+        public IObservable<Unit> DeletePullRequestReviewComment(
+            string owner,
+            string name,
+            int number)
+        {
+            return gitHubClient.PullRequest.ReviewComment.Delete(owner, name, number);
+        }
+
         public IObservable<Gist> CreateGist(NewGist newGist)
         {
             return gitHubClient.Gist.Create(newGist);

src/GitHub.Exports.Reactive/Api/IApiClient.cs

@@ -94,5 +94,10 @@ IObservable<PullRequestReviewComment> CreatePullRequestReviewComment(
         IObservable<Repository> GetRepositories();
         IObservable<Repository> GetRepository(string owner, string repo);
         IObservable<RepositoryContent> GetFileContents(string owner, string name, string reference, string path);
+
+        IObservable<Unit> DeletePullRequestReviewComment(
+            string owner,
+            string name,
+            int number);
     }
 }

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

@@ -134,7 +134,7 @@ Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// Posts the currently pending review.
         /// </summary>
         /// <param name="body">The review body.</param>
-        /// <param name="state">The review event.</param>
+        /// <param name="e">The review event.</param>
         /// <returns>The review model.</returns>
         Task<IPullRequestReviewModel> PostReview(string body, PullRequestReviewEvent e);
 
@@ -145,5 +145,12 @@ Task<IPullRequestReviewCommentModel> PostReviewComment(
         /// <param name="pullRequest">The new pull request model.</param>
         /// <returns>A task which completes when the session has completed updating.</returns>
         Task Update(IPullRequestModel pullRequest);
+
+        /// <summary>
+        /// Deletes a pull request comment.
+        /// </summary>
+        /// <param name="number">The number of the pull request comment to delete</param>
+        /// <returns>A task which completes when the session has completed updating.</returns>
+        Task DeleteComment(int number);
     }
 }

src/GitHub.Exports/Models/UsageModel.cs

@@ -64,6 +64,7 @@ public class MeasuresModel
             public int NumberOfPRDetailsOpenFileInSolution { get; set; }
             public int NumberOfPRReviewDiffViewInlineCommentOpen { get; set; }
             public int NumberOfPRReviewDiffViewInlineCommentPost { get; set; }
+            public int NumberOfPRReviewDiffViewInlineCommentDelete { get; set; }
             public int NumberOfPRReviewDiffViewInlineCommentStartReview { get; set; }
             public int NumberOfPRReviewPosts { get; set; }
             public int NumberOfShowCurrentPullRequest { get; set; }

src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs

@@ -90,7 +90,8 @@ Task<bool> IsUnmodifiedAndPushed(
         /// Extracts a file at a specified commit from the repository.
         /// </summary>
         /// <param name="repository">The repository.</param>
-        /// <param name="commitSha">The SHA of the commit.</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
+        /// <param name="sha">The SHA of the commit.</param>
         /// <param name="relativePath">The path to the file, relative to the repository.</param>
         /// <returns>
         /// The contents of the file, or null if the file was not found at the specified commit.
@@ -146,7 +147,7 @@ Task<byte[]> ExtractFileFromGit(
         /// <summary>
         /// Gets the GraphQL ID for a pull request.
         /// </summary>
-        /// <param name="repository">The local repository.</param>
+        /// <param name="localRepository">The local repository.</param>
         /// <param name="repositoryOwner">The owner of the remote fork.</param>
         /// <param name="number">The pull request number.</param>
         /// <returns></returns>
@@ -184,6 +185,7 @@ Task<IPullRequestReviewModel> CreatePendingReview(
         /// <summary>
         /// Cancels a pending review on the server.
         /// </summary>
+        /// <param name="localRepository">The local repository.</param>
         /// <param name="reviewId">The GraphQL ID of the review.</param>
         Task CancelPendingReview(
             ILocalRepositoryModel localRepository,
@@ -297,5 +299,19 @@ Task<IPullRequestReviewCommentModel> PostStandaloneReviewCommentReply(
             int number,
             string body,
             int inReplyTo);
+
+        /// <summary>
+        /// Delete a PR review comment.
+        /// </summary>
+        /// <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>
+        /// <returns></returns>
+        Task DeleteComment(
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
+            IAccount user,
+            int number);
     }
 }

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -164,6 +164,17 @@ public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             return model;
         }
 
+        /// <inheritdoc/>
+        public async Task DeleteComment(
+            int number)
+        {
+            await service.DeleteComment(
+                LocalRepository,
+                RepositoryOwner,
+                User,
+                number);
+        }
+
         /// <inheritdoc/>
         public async Task<IPullRequestReviewCommentModel> PostReviewComment(
             string body,

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -600,6 +600,23 @@ public async Task<IPullRequestReviewCommentModel> PostStandaloneReviewCommentRep
             };
         }
 
+        public async Task DeleteComment(
+            ILocalRepositoryModel localRepository,
+            string remoteRepositoryOwner,
+            IAccount user,
+            int number)
+        {
+            var address = HostAddress.Create(localRepository.CloneUrl.Host);
+            var apiClient = await apiClientFactory.Create(address);
+
+            await apiClient.DeletePullRequestReviewComment(
+                remoteRepositoryOwner,
+                localRepository.Name,
+                number);
+
+            await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentDelete);
+        }
+
         int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk> diff)
         {
             var line = DiffUtilities.Match(diff, thread.DiffMatch);

src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs

@@ -13,7 +13,7 @@ public abstract class CommentThreadViewModel : ReactiveObject, ICommentThreadVie
     {
         ReactiveCommand<ICommentModel> postComment;
         private ReactiveCommand<ICommentModel> editComment;
-        private ReactiveCommand<ICommentModel> deleteComment;
+        private ReactiveCommand<object> deleteComment;
 
         /// <summary>
         /// Intializes a new instance of the <see cref="CommentThreadViewModel"/> class.
@@ -57,7 +57,7 @@ public ReactiveCommand<ICommentModel> EditComment
             }
         }
 
-        public ReactiveCommand<ICommentModel> DeleteComment
+        public ReactiveCommand<object> DeleteComment
         {
             get { return deleteComment; }
             set

src/GitHub.InlineReviews/ViewModels/ICommentThreadViewModel.cs

@@ -40,6 +40,6 @@ public interface ICommentThreadViewModel
         /// <summary>
         /// Called by a comment in the thread to send a delete of the comment to the API.
         /// </summary>
-        ReactiveCommand<ICommentModel> DeleteComment { get; }
+        ReactiveCommand<object> DeleteComment { get; }
     }
 }

src/GitHub.InlineReviews/ViewModels/InlineCommentThreadViewModel.cs

@@ -88,11 +88,12 @@ Task<ICommentModel> DoEditComment(object parameter)
             throw new NotImplementedException();
         }
 
-        Task<ICommentModel> DoDeleteComment(object parameter)
+        async Task<object> DoDeleteComment(object parameter)
         {
             Guard.ArgumentNotNull(parameter, nameof(parameter));
 
-            throw new NotImplementedException();
+            var number = (int)parameter;
+            await Session.DeleteComment(number);
         }
     }
 }