Added PullRequestUserReviewsViewModel tests.

And refactored the `PullRequestUserReviewsViewModel` a little bit to remove stuff that is no longer necessary.

Author: grokys

src/GitHub.App/ViewModels/GitHubPane/PullRequestReviewViewModel.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
 using GitHub.Extensions;
 using GitHub.Logging;
 using GitHub.Models;
 using GitHub.Services;
+using ReactiveUI;
 using Serilog;
 
 namespace GitHub.ViewModels.GitHubPane
@@ -19,44 +18,38 @@ public class PullRequestReviewViewModel : ViewModelBase, IPullRequestReviewViewM
 
         readonly IPullRequestEditorService editorService;
         readonly IPullRequestSession session;
+        bool isExpanded;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestReviewViewModel"/> class.
         /// </summary>
-        /// <param name="localRepository">The local repository.</param>
-        /// <param name="owner">The pull request's repository owner.</param>
+        /// <param name="editorService">The pull request editor service.</param>
+        /// <param name="session">The pull request session.</param>
         /// <param name="pullRequest">The pull request model.</param>
-        /// <param name="pullRequestReviewId">The pull request review ID.</param>
+        /// <param name="model">The pull request review model.</param>
         public PullRequestReviewViewModel(
             IPullRequestEditorService editorService,
             IPullRequestSession session,
-            ILocalRepositoryModel localRepository,
-            string owner,
             IPullRequestModel pullRequest,
-            long pullRequestReviewId)
+            IPullRequestReviewModel model)
         {
             Guard.ArgumentNotNull(editorService, nameof(editorService));
             Guard.ArgumentNotNull(session, nameof(session));
-            Guard.ArgumentNotNull(localRepository, nameof(localRepository));
-            Guard.ArgumentNotNull(owner, nameof(owner));
-            Guard.ArgumentNotNull(pullRequest, nameof(pullRequest));
+            Guard.ArgumentNotNull(model, nameof(model));
 
             this.editorService = editorService;
             this.session = session;
 
-            LocalRepository = localRepository;
-            RemoteRepositoryOwner = owner;
-            Model = GetModel(pullRequest, pullRequestReviewId);
-            PullRequestModel = pullRequest;
+            Model = model;
             Body = string.IsNullOrWhiteSpace(Model.Body) ? null : Model.Body;
             StateDisplay = ToString(Model.State);
 
             var comments = new List<IPullRequestReviewFileCommentViewModel>();
             var outdated = new List<IPullRequestReviewFileCommentViewModel>();
 
-            foreach (var comment in PullRequestModel.ReviewComments)
+            foreach (var comment in pullRequest.ReviewComments)
             {
-                if (comment.PullRequestReviewId == pullRequestReviewId)
+                if (comment.PullRequestReviewId == model.Id)
                 {
                     var vm = new PullRequestReviewFileCommentViewModel(
                         editorService,
@@ -76,29 +69,23 @@ public PullRequestReviewViewModel(
             HasDetails = Body != null ||
                 FileComments.Count > 0 ||
                 OutdatedFileComments.Count > 0;
-            IsExpanded = HasDetails && CalculateIsLatest(pullRequest, Model);
         }
 
-        /// <inheritdoc/>
-        public ILocalRepositoryModel LocalRepository { get; private set; }
-
-        /// <inheritdoc/>
-        public string RemoteRepositoryOwner { get; private set; }
-
         /// <inheritdoc/>
         public IPullRequestReviewModel Model { get; }
 
-        /// <inheritdoc/>
-        public IPullRequestModel PullRequestModel { get; }
-
         /// <inheritdoc/>
         public string Body { get; }
 
         /// <inheritdoc/>
         public string StateDisplay { get; }
 
         /// <inheritdoc/>
-        public bool IsExpanded { get; }
+        public bool IsExpanded
+        {
+            get { return isExpanded; }
+            set { this.RaiseAndSetIfChanged(ref isExpanded, value); }
+        }
 
         /// <inheritdoc/>
         public bool HasDetails { get; }
@@ -109,26 +96,6 @@ public PullRequestReviewViewModel(
         /// <inheritdoc/>
         public IReadOnlyList<IPullRequestReviewFileCommentViewModel> OutdatedFileComments { get; }
 
-        static bool CalculateIsLatest(IPullRequestModel pullRequest, IPullRequestReviewModel model)
-        {
-            return !pullRequest.Reviews.Any(x =>
-                x.User.Login == model.User.Login &&
-                x.SubmittedAt > model.SubmittedAt);
-        }
-
-        static IPullRequestReviewModel GetModel(IPullRequestModel pullRequest, long pullRequestReviewId)
-        {
-            var result = pullRequest.Reviews.FirstOrDefault(x => x.Id == pullRequestReviewId);
-
-            if (result == null)
-            {
-                throw new KeyNotFoundException(
-                    $"Unable to find review {pullRequestReviewId} in pull request #{pullRequest.Number}");
-            }
-
-            return result;
-        }
-
         static string ToString(PullRequestReviewState state)
         {
             switch (state)

src/GitHub.App/ViewModels/GitHubPane/PullRequestUserReviewsViewModel.cs

@@ -139,28 +139,28 @@ public override async Task Refresh()
         }
 
         /// <inheritdoc/>
-        public async Task Load(IAccount user, IPullRequestModel pullRequest)
+        async Task Load(IAccount user, IPullRequestModel pullRequest)
         {
+            IsBusy = true;
+
             try
             {
                 session = await sessionManager.GetSession(pullRequest);
                 User = user;
                 PullRequestTitle = pullRequest.Title;
 
                 var reviews = new List<IPullRequestReviewViewModel>();
+                var isFirst = true;
 
                 foreach (var review in pullRequest.Reviews.OrderByDescending(x => x.SubmittedAt))
                 {
-                    if (review.User.Login == user.Login)
+                    if (review.User.Login == user.Login &&
+                        review.State != PullRequestReviewState.Pending)
                     {
-                        var vm = new PullRequestReviewViewModel(
-                            editorService,
-                            session,
-                            LocalRepository,
-                            RemoteRepositoryOwner,
-                            pullRequest,
-                            review.Id);
+                        var vm = new PullRequestReviewViewModel(editorService, session, pullRequest, review);
+                        vm.IsExpanded = isFirst;
                         reviews.Add(vm);
+                        isFirst = false;
                     }
                 }
 

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestReviewViewModel.cs

@@ -9,30 +9,11 @@ namespace GitHub.ViewModels.GitHubPane
     /// </summary>
     public interface IPullRequestReviewViewModel : IViewModel
     {
-        /// <summary>
-        /// Gets the local repository.
-        /// </summary>
-        ILocalRepositoryModel LocalRepository { get; }
-
-        /// <summary>
-        /// Gets the owner of the remote repository that contains the pull request.
-        /// </summary>
-        /// <remarks>
-        /// The remote repository may be different from the local repository if the local
-        /// repository is a fork and the user is viewing pull requests from the parent repository.
-        /// </remarks>
-        string RemoteRepositoryOwner { get; }
-
         /// <summary>
         /// Gets the underlying pull request review model.
         /// </summary>
         IPullRequestReviewModel Model { get; }
 
-        /// <summary>
-        /// Gets the underlying pull request model.
-        /// </summary>
-        IPullRequestModel PullRequestModel { get; }
-
         /// <summary>
         /// Gets the body of the review.
         /// </summary>

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestUserReviewsViewModel.cs

@@ -65,13 +65,5 @@ Task InitializeAsync(
             string repo,
             int pullRequestNumber,
             string login);
-
-        /// <summary>
-        /// Loads the view model from pre-loaded models.
-        /// </summary>
-        /// <param name="user">The user model.</param>
-        /// <param name="pullRequest">The pull request model.</param>
-        /// <returns></returns>
-        Task Load(IAccount user, IPullRequestModel pullRequest);
     }
 }