Merge pull request #1830 from github/sorting-reviews

Sorting Pull Request reviews by date

Author: StanleyGoldman

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

@@ -41,7 +41,7 @@ public static IEnumerable<PullRequestReviewSummaryViewModel> BuildByUser(
         {
             var existing = new Dictionary<string, PullRequestReviewSummaryViewModel>();
 
-            foreach (var review in pullRequest.Reviews.OrderBy(x => x.Id))
+            foreach (var review in pullRequest.Reviews.OrderBy(x => x.SubmittedAt))
             {
                 if (review.State == PullRequestReviewState.Pending && review.Author.Login != currentUser.Login)
                     continue;

test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs

@@ -56,12 +56,13 @@ public class TheReviewsProperty : TestBaseClass
             [Test]
             public async Task ShouldShowLatestAcceptedOrChangesRequestedReviewAsync()
             {
+                var dateTimeOffset = DateTimeOffset.Now;
                 var target = CreateTarget();
                 var model = CreatePullRequestModel(
-                    CreatePullRequestReviewModel("1", "grokys", PullRequestReviewState.ChangesRequested),
-                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.ChangesRequested),
-                    CreatePullRequestReviewModel("3", "grokys", PullRequestReviewState.Approved),
-                    CreatePullRequestReviewModel("4", "grokys", PullRequestReviewState.Commented));
+                    CreatePullRequestReviewModel("1", "grokys", PullRequestReviewState.ChangesRequested, dateTimeOffset.AddMinutes(1)),
+                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.ChangesRequested, dateTimeOffset.AddMinutes(2)),
+                    CreatePullRequestReviewModel("3", "grokys", PullRequestReviewState.Approved, dateTimeOffset.AddMinutes(3)),
+                    CreatePullRequestReviewModel("4", "grokys", PullRequestReviewState.Commented, dateTimeOffset.AddMinutes(4)));
 
                 await target.Load(model);
 
@@ -77,10 +78,11 @@ public async Task ShouldShowLatestAcceptedOrChangesRequestedReviewAsync()
             [Test]
             public async Task ShouldShowLatestCommentedReviewIfNothingElsePresentAsync()
             {
+                var dateTimeOffset = DateTimeOffset.Now;
                 var target = CreateTarget();
                 var model = CreatePullRequestModel(
-                    CreatePullRequestReviewModel("1", "shana", PullRequestReviewState.Commented),
-                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.Commented));
+                    CreatePullRequestReviewModel("1", "shana", PullRequestReviewState.Commented, dateTimeOffset.AddMinutes(1)),
+                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.Commented, dateTimeOffset.AddMinutes(2)));
 
                 await target.Load(model);
 
@@ -107,9 +109,11 @@ public async Task ShouldNotShowStartNewReviewWhenHasPendingReviewAsync()
             [Test]
             public async Task ShouldShowPendingReviewOverApprovedAsync()
             {
+                var dateTimeOffset = DateTimeOffset.Now;
+
                 var target = CreateTarget();
                 var model = CreatePullRequestModel(
-                    CreatePullRequestReviewModel("1", "grokys", PullRequestReviewState.Approved),
+                    CreatePullRequestReviewModel("1", "grokys", PullRequestReviewState.Approved, dateTimeOffset.AddMinutes(1)),
                     CreatePullRequestReviewModel("2", "grokys", PullRequestReviewState.Pending));
 
                 await target.Load(model);
@@ -139,10 +143,10 @@ static PullRequestDetailModel CreatePullRequestModel(
                 return PullRequestDetailViewModelTests.CreatePullRequestModel(reviews: reviews);
             }
 
-            static PullRequestReviewModel CreatePullRequestReviewModel(
-                string id,
+            static PullRequestReviewModel CreatePullRequestReviewModel(string id,
                 string login,
-                PullRequestReviewState state)
+                PullRequestReviewState state,
+                DateTimeOffset? submittedAt = null)
             {
                 var account = new ActorModel
                 {
@@ -154,6 +158,7 @@ static PullRequestReviewModel CreatePullRequestReviewModel(
                     Id = id,
                     Author = account,
                     State = state,
+                    SubmittedAt = submittedAt
                 };
             }
         }