Adding pull request summary state to the list

StanleyGoldman · StanleyGoldman · commit 047ba1a90843 · 2018-07-19T17:50:49.000-04:00
diff --git a/src/GitHub.App/Models/PullRequestModel.cs b/src/GitHub.App/Models/PullRequestModel.cs
@@ -124,6 +124,17 @@ public PullRequestStateEnum State
             }
         }
 
+        PullRequestChecksEnum checks;
+        public PullRequestChecksEnum Checks
+        {
+            get { return checks; }
+            set
+            {
+                checks = value;
+                this.RaisePropertyChange();
+            }
+        }
+
         // TODO: Remove these property once maintainer workflow has been merged to master.
         public bool IsOpen => State == PullRequestStateEnum.Open;
         public bool Merged => State == PullRequestStateEnum.Merged;
diff --git a/src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs b/src/GitHub.App/SampleData/PullRequestListItemViewModelDesigner.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using GitHub.Models;
 using GitHub.ViewModels;
 using GitHub.ViewModels.GitHubPane;
 
@@ -16,5 +17,6 @@ public class PullRequestListItemViewModelDesigner : ViewModelBase, IPullRequestL
         public int Number { get; set; }
         public string Title { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
+        public PullRequestChecksEnum Checks { get; set; }
     }
 }
diff --git a/src/GitHub.App/Services/ModelService.cs b/src/GitHub.App/Services/ModelService.cs
@@ -440,6 +440,7 @@ IPullRequestModel Create(PullRequestCacheItem prCacheItem)
                 CommitCount = prCacheItem.CommitCount,
                 CreatedAt = prCacheItem.CreatedAt,
                 Head = Create(prCacheItem.Head),
+                Checks = prCacheItem.Checks ?? PullRequestChecksEnum.None,
                 State = prCacheItem.State.HasValue ?
                     prCacheItem.State.Value :
                     prCacheItem.IsOpen.Value ? PullRequestStateEnum.Open : PullRequestStateEnum.Closed,
@@ -577,6 +578,7 @@ public PullRequestCacheItem(PullRequest pr)
             
             // Nullable for compatibility with old caches.
             public PullRequestStateEnum? State { get; set; }
+            public PullRequestChecksEnum? Checks { get; set; }
 
             // This fields exists only for compatibility with old caches. The State property should be used.
             public bool? IsOpen { get; set; }
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -96,25 +96,19 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                             LastCommit = pr.Commits(null, null, 1, null).Nodes.Select(commit =>
                                 new LastCommitSummaryModel
                                 {
-                                    Id = commit.Id,
-                                    Checks = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
-                                        .Select(suite => new CheckSuiteSummaryModel
-                                        {
-                                            Conclusion = (CheckConclusionStateEnum?) suite.Conclusion,
-                                            Status = (CheckStatusStateEnum) suite.Status,
-                                        }).ToList(),
-                                    
-                                    /*
-                                    TODO: Resolve https://github.com/octokit/octokit.graphql.net/pull/122
-                                    Contexts can be null
-
-                                    Statuses = commit.Commit.Status.Contexts
-                                            .Select(context => new
-                                            {
-                                                context.Context,
-                                                context.State,
-                                            }).ToList()
-                                    */
+//                                    CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
+//                                        .Select(suite => new CheckSuiteSummaryModel
+//                                        {
+//                                            Conclusion = (CheckConclusionStateEnum?)suite.Conclusion,
+//                                            Status = (CheckStatusStateEnum)suite.Status,
+//                                        }).ToList(),
+                                    Statuses = commit.Commit.Status
+                                            .Select(context =>
+                                                context.Contexts.Select(statusContext => new StatusSummaryModel
+                                                {
+                                                    State = (StatusStateEnum)statusContext.State,
+                                                }).ToList()
+                                            ).SingleOrDefault()
                                 }).ToList().FirstOrDefault(),
                             Author = new ActorModel
                             {
@@ -150,6 +144,71 @@ Contexts can be null
             {
                 item.CommentCount += item.Reviews.Sum(x => x.Count);
                 item.Reviews = null;
+
+                var hasCheckSuites = item.LastCommit.CheckSuites != null 
+                                     && item.LastCommit.CheckSuites.Any();
+
+                var hasStatuses = item.LastCommit.Statuses != null 
+                                  && item.LastCommit.Statuses.Any();
+
+                if (!hasCheckSuites && !hasStatuses)
+                {
+                    item.Checks = PullRequestChecksEnum.None;
+                }
+                else
+                {
+                    var checksHasFailure = false;
+                    var checksHasCompleteSuccess = true;
+
+                    if (hasCheckSuites)
+                    {
+                        checksHasFailure = item.LastCommit
+                            .CheckSuites.Any(model => model.Conclusion.HasValue
+                                                      && (model.Conclusion.Value == CheckConclusionStateEnum.Failure
+                                                          || model.Conclusion.Value ==
+                                                          CheckConclusionStateEnum.ActionRequired));
+
+                        if (!checksHasFailure)
+                        {
+                            checksHasCompleteSuccess = item.LastCommit
+                                .CheckSuites.All(model => model.Conclusion.HasValue
+                                                          && (model.Conclusion.Value == CheckConclusionStateEnum.Success
+                                                              || model.Conclusion.Value ==
+                                                              CheckConclusionStateEnum.Neutral));
+                        }
+                    }
+
+                    var statusHasFailure = false;
+                    var statusHasCompleteSuccess = true;
+
+                    if (!checksHasFailure && hasStatuses)
+                    {
+                        statusHasFailure = item.LastCommit
+                            .Statuses
+                            .Any(status => status.State == StatusStateEnum.Failure);
+
+                        if (!statusHasFailure)
+                        {
+                            statusHasCompleteSuccess =
+                                item.LastCommit.Statuses.All(status => status.State == StatusStateEnum.Success);
+                        }
+                    }
+
+                    if (checksHasFailure || statusHasFailure)
+                    {
+                        item.Checks = PullRequestChecksEnum.Failure;
+                    }
+                    else if (statusHasCompleteSuccess && checksHasCompleteSuccess)
+                    {
+                        item.Checks = PullRequestChecksEnum.Success;
+                    }
+                    else
+                    {
+                        item.Checks = PullRequestChecksEnum.Pending;
+                    }
+                }
+
+                item.LastCommit = null;
             }
 
             return result;
@@ -876,9 +935,9 @@ class ReviewAdapter
 
         class LastCommitSummaryModel
         {
-            public ID Id { get; set; }
+            public List<CheckSuiteSummaryModel> CheckSuites { get; set; }
 
-            public List<CheckSuiteSummaryModel> Checks { get; set; }
+            public List<StatusSummaryModel> Statuses { get; set; }
         }
 
         class CheckSuiteSummaryModel
@@ -888,4 +947,9 @@ class CheckSuiteSummaryModel
             public CheckStatusStateEnum Status { get; set; }
         }
     }
+
+    public class StatusSummaryModel
+    {
+        public StatusStateEnum State { get; set; }
+    }
 }
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestListItemViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestListItemViewModel.cs
@@ -19,6 +19,7 @@ public PullRequestListItemViewModel(PullRequestListItemModel model)
         {
             Id = model.Id;
             Author = new ActorViewModel(model.Author);
+            Checks = model.Checks;
             CommentCount = model.CommentCount;
             Number = model.Number;
             Title = model.Title;
@@ -31,6 +32,9 @@ public PullRequestListItemViewModel(PullRequestListItemModel model)
         /// <inheritdoc/>
         public IActorViewModel Author { get; protected set; }
 
+        /// <inheritdoc/>
+        public PullRequestChecksEnum Checks { get; protected set; }
+
         /// <inheritdoc/>
         public int CommentCount { get; protected set; }
 
diff --git a/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListItemViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListItemViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using GitHub.Models;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -27,5 +28,10 @@ public interface IPullRequestListItemViewModel : IIssueListItemViewModelBase
         /// Gets the last updated time of the pull request.
         /// </summary>
         DateTimeOffset UpdatedAt { get; }
+
+        /// <summary>
+        /// Gets the pull request checks and statuses summary
+        /// </summary>
+        PullRequestChecksEnum Checks { get; }
     }
 }
diff --git a/src/GitHub.Exports/Models/CheckSuiteModel.cs b/src/GitHub.Exports/Models/CheckSuiteModel.cs
@@ -3,6 +3,34 @@
 
 namespace GitHub.Models
 {
+    public class LastCommitModel
+    {
+        public string Id { get; set; }
+        public List<CheckSuiteModel> CheckSuites { get; set; }
+
+        public List<StatusModel> Statuses { get; set; }
+    }
+
+    public enum StatusStateEnum
+    {
+        Expected,
+        Error,
+        Failure,
+        Pending,
+        Success,
+    }
+
+    public class StatusModel
+    {
+        public StatusStateEnum State { get; set; }
+
+        public string Context { get; set; }
+
+        public string TargetUrl { get; set; }
+
+        public string Description { get; set; }
+    }
+
     public class CheckSuiteModel
     {
         public CheckConclusionStateEnum? Conclusion { get; set; }
diff --git a/src/GitHub.Exports/Models/IPullRequestModel.cs b/src/GitHub.Exports/Models/IPullRequestModel.cs
@@ -13,12 +13,21 @@ public enum PullRequestStateEnum
         Merged,
     }
 
+    public enum PullRequestChecksEnum
+    {
+        None,
+        Pending,
+        Success,
+        Failure
+    }
+
     public interface IPullRequestModel : ICopyable<IPullRequestModel>,
         IEquatable<IPullRequestModel>, IComparable<IPullRequestModel>
     {
         int Number { get; }
         string Title { get; }
         PullRequestStateEnum State { get; }
+        PullRequestChecksEnum Checks { get; }
         int CommentCount { get; }
         int CommitCount { get; }
         bool IsOpen { get; }
diff --git a/src/GitHub.Exports/Models/PullRequestDetailModel.cs b/src/GitHub.Exports/Models/PullRequestDetailModel.cs
@@ -92,6 +92,6 @@ public class PullRequestDetailModel
         /// </remarks>
         public IReadOnlyList<PullRequestReviewThreadModel> Threads { get; set; }
 
-        public List<CheckSuiteModel> CheckSuites { get; set; }
+        public LastCommitModel LastCommit { get; set; }
     }
 }
diff --git a/src/GitHub.Exports/Models/PullRequestListItemModel.cs b/src/GitHub.Exports/Models/PullRequestListItemModel.cs
@@ -37,6 +37,11 @@ public class PullRequestListItemModel
         /// </summary>
         public PullRequestStateEnum State { get; set; }
 
+        /// <summary>
+        /// Gets the pull request checks and statuses summary
+        /// </summary>
+        public PullRequestChecksEnum Checks { get; set; }
+
         /// <summary>
         /// Gets or sets the date/time at which the pull request was last updated.
         /// </summary>
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -38,7 +38,7 @@ public class PullRequestSessionService : IPullRequestSessionService
     {
         static readonly ILogger log = LogManager.ForContext<PullRequestSessionService>();
         static ICompiledQuery<PullRequestDetailModel> readPullRequest;
-        static ICompiledQuery<IEnumerable<List<CheckSuiteModel>>> readCheckSuites;
+        static ICompiledQuery<IEnumerable<LastCommitModel>> readCheckSuites;
         static ICompiledQuery<ActorModel> readViewer;
 
         readonly IGitService gitService;
@@ -340,9 +340,9 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
 
             var apiClient = await apiClientFactory.Create(address);
             var files = await apiClient.GetPullRequestFiles(owner, name, number).ToList();
-            var checkSuites = await GetPullRequestCheckSuites(address, owner, name, number);
+            var lastCommitModel = await GetPullRequestLastCommitModel(address, owner, name, number);
 
-            result.CheckSuites = checkSuites;
+            result.LastCommit = lastCommitModel;
 
             result.ChangedFiles = files.Select(file => new PullRequestFileModel
             {
@@ -355,41 +355,55 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
             return result;
         }
 
-        private async Task<List<CheckSuiteModel>> GetPullRequestCheckSuites(HostAddress address, string owner, string name, int number)
+        private async Task<LastCommitModel> GetPullRequestLastCommitModel(HostAddress address, string owner, string name, int number)
         {
             if(readCheckSuites == null)
             {
                 readCheckSuites = new Query()
                 .Repository(Var(nameof(owner)), Var(nameof(name)))
                 .PullRequest(Var(nameof(number))).Commits(last: 1).Nodes.Select(
-                    commit => commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
-                        .Select(suite => new CheckSuiteModel
-                        {
-                            Conclusion = (CheckConclusionStateEnum?) suite.Conclusion,
-                            Status = (CheckStatusStateEnum) suite.Status,
-                            CreatedAt = suite.CreatedAt,
-                            UpdatedAt = suite.UpdatedAt,
-                            CheckRuns = suite.CheckRuns(null, null, null, null, null).AllPages(10)
-                                .Select(run => new CheckRunModel
+                    commit => new LastCommitModel
+                    {
+                        Id = commit.Commit.Id.Value,
+//                        CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
+//                            .Select(suite => new CheckSuiteModel
+//                            {
+//                                Conclusion = (CheckConclusionStateEnum?)suite.Conclusion,
+//                                Status = (CheckStatusStateEnum)suite.Status,
+//                                CreatedAt = suite.CreatedAt,
+//                                UpdatedAt = suite.UpdatedAt,
+//                                CheckRuns = suite.CheckRuns(null, null, null, null, null).AllPages(10)
+//                                    .Select(run => new CheckRunModel
+//                                    {
+//                                        Conclusion = (CheckConclusionStateEnum?)run.Conclusion,
+//                                        Status = (CheckStatusStateEnum)run.Status,
+//                                        StartedAt = run.StartedAt,
+//                                        CompletedAt = run.CompletedAt,
+//                                        Annotations = run.Annotations(null, null, null, null).AllPages()
+//                                            .Select(annotation => new CheckRunAnnotationModel
+//                                            {
+//                                                BlobUrl = annotation.BlobUrl,
+//                                                StartLine = annotation.StartLine,
+//                                                EndLine = annotation.EndLine,
+//                                                Filename = annotation.Filename,
+//                                                Message = annotation.Message,
+//                                                Title = annotation.Title,
+//                                                WarningLevel = (CheckAnnotationLevelEnum?)annotation.WarningLevel,
+//                                                RawDetails = annotation.RawDetails
+//                                            }).ToList()
+//                                    }).ToList()
+//                            }).ToList(),
+                        Statuses = commit.Commit.Status
+                            .Select(context =>
+                                context.Contexts.Select(statusContext => new StatusModel
                                 {
-                                    Conclusion = (CheckConclusionStateEnum?) run.Conclusion,
-                                    Status = (CheckStatusStateEnum) run.Status,
-                                    StartedAt = run.StartedAt,
-                                    CompletedAt = run.CompletedAt,
-                                    Annotations = run.Annotations(null, null, null, null).AllPages()
-                                        .Select(annotation => new CheckRunAnnotationModel
-                                        {
-                                            BlobUrl = annotation.BlobUrl,
-                                            StartLine = annotation.StartLine,
-                                            EndLine = annotation.EndLine,
-                                            Filename = annotation.Filename,
-                                            Message = annotation.Message,
-                                            Title = annotation.Title,
-                                            WarningLevel = (CheckAnnotationLevelEnum?) annotation.WarningLevel,
-                                            RawDetails = annotation.RawDetails
-                                        }).ToList()
+                                    State = (StatusStateEnum)statusContext.State,
+                                    Context = statusContext.Context,
+                                    TargetUrl = statusContext.TargetUrl,
+                                    Description = statusContext.Description
                                 }).ToList()
-                        }).ToList()
+                            ).SingleOrDefault()
+                    }
                 ).Compile();
             }
 
diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListItemView.xaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Diagnostics.CodeAnalysis;`
	`4`	`+using GitHub.Models;`
`4`	`5`	`using GitHub.ViewModels;`
`5`	`6`	`using GitHub.ViewModels.GitHubPane;`
`6`	`7`
`@@ -16,5 +17,6 @@ public class PullRequestListItemViewModelDesigner : ViewModelBase, IPullRequestL`
`16`	`17`	`public int Number { get; set; }`
`17`	`18`	`public string Title { get; set; }`
`18`	`19`	`public DateTimeOffset UpdatedAt { get; set; }`
	`20`	`+ public PullRequestChecksEnum Checks { get; set; }`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using GitHub.Models;`
`2`	`3`
`3`	`4`	`namespace GitHub.ViewModels.GitHubPane`
`4`	`5`	`{`
`@@ -27,5 +28,10 @@ public interface IPullRequestListItemViewModel : IIssueListItemViewModelBase`
`27`	`28`	`/// Gets the last updated time of the pull request.`
`28`	`29`	`/// </summary>`
`29`	`30`	`DateTimeOffset UpdatedAt { get; }`
	`31`	`+`
	`32`	`+ /// <summary>`
	`33`	`+ /// Gets the pull request checks and statuses summary`
	`34`	`+ /// </summary>`
	`35`	`+ PullRequestChecksEnum Checks { get; }`
`30`	`36`	`}`
`31`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,6 @@ public class PullRequestDetailModel`
`92`	`92`	`/// </remarks>`
`93`	`93`	`public IReadOnlyList<PullRequestReviewThreadModel> Threads { get; set; }`
`94`	`94`
`95`		`- public List<CheckSuiteModel> CheckSuites { get; set; }`
	`95`	`+ public LastCommitModel LastCommit { get; set; }`
`96`	`96`	`}`
`97`	`97`	`}`