Fixing Checks API support

Author: StanleyGoldman

src/GitHub.App/GitHub.App.csproj

@@ -231,7 +231,6 @@
     <Compile Include="Services\EnterpriseCapabilitiesService.cs" />
     <Compile Include="Services\GitHubContextService.cs" />
     <Compile Include="Services\GlobalConnection.cs" />
-    <Compile Include="Services\ChecksService.cs" />
     <Compile Include="Services\RepositoryForkService.cs" />
     <Compile Include="Services\RepositoryService.cs" />
     <Compile Include="ViewModels\ActorViewModel.cs" />

src/GitHub.App/Services/ChecksService.cs

@@ -23,6 +23,8 @@
 using Rothko;
 using static System.FormattableString;
 using static Octokit.GraphQL.Variable;
+using CheckConclusionState = GitHub.Models.CheckConclusionState;
+using CheckStatusState = GitHub.Models.CheckStatusState;
 using StatusState = GitHub.Models.StatusState;
 
 namespace GitHub.Services
@@ -98,12 +100,12 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                             LastCommit = pr.Commits(null, null, 1, null).Nodes.Select(commit =>
                                 new LastCommitSummaryModel
                                 {
-//                                    CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
-//                                        .Select(suite => new CheckSuiteSummaryModel
-//                                        {
-//                                            Conclusion = (CheckConclusionStateEnum?)suite.Conclusion,
-//                                            Status = (CheckStatusStateEnum)suite.Status,
-//                                        }).ToList(),
+                                    CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
+                                        .Select(suite => new CheckSuiteSummaryModel
+                                        {
+                                            Conclusion = (CheckConclusionState?)suite.Conclusion,
+                                            Status = (CheckStatusState)suite.Status,
+                                        }).ToList(),
                                     Statuses = commit.Commit.Status
                                             .Select(context =>
                                                 context.Contexts.Select(statusContext => new StatusSummaryModel
@@ -147,34 +149,58 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 item.CommentCount += item.Reviews.Sum(x => x.Count);
                 item.Reviews = null;
 
-                var hasCheckSuites = item.LastCommit.CheckSuites != null 
+                var hasCheckSuites = item.LastCommit.CheckSuites != null
                                      && item.LastCommit.CheckSuites.Any();
 
-                var hasStatuses = item.LastCommit.Statuses != null 
+                var hasStatuses = item.LastCommit.Statuses != null
                                   && item.LastCommit.Statuses.Any();
 
-                if (!hasStatuses)
+                if (!hasCheckSuites && !hasStatuses)
                 {
                     item.Checks = PullRequestChecksState.None;
                 }
                 else
                 {
-                    var statusHasFailure = item.LastCommit
-                        .Statuses
-                        .Any(status => status.State == StatusState.Failure);
+                    var checksHasFailure = false;
+                    var checksHasCompleteSuccess = true;
 
+                    if (hasCheckSuites)
+                    {
+                        checksHasFailure = item.LastCommit
+                            .CheckSuites.Any(model => model.Conclusion.HasValue
+                                                      && (model.Conclusion.Value == CheckConclusionState.Failure
+                                                          || model.Conclusion.Value == CheckConclusionState.ActionRequired));
+
+                        if (!checksHasFailure)
+                        {
+                            checksHasCompleteSuccess = item.LastCommit
+                                .CheckSuites.All(model => model.Conclusion.HasValue
+                                                          && (model.Conclusion.Value == CheckConclusionState.Success
+                                                              || model.Conclusion.Value == CheckConclusionState.Neutral));
+                        }
+                    }
+
+                    var statusHasFailure = false;
                     var statusHasCompleteSuccess = true;
-                    if (!statusHasFailure)
+
+                    if (!checksHasFailure && hasStatuses)
                     {
-                        statusHasCompleteSuccess =
-                            item.LastCommit.Statuses.All(status => status.State == StatusState.Success);
+                        statusHasFailure = item.LastCommit
+                            .Statuses
+                            .Any(status => status.State == StatusState.Failure);
+
+                        if (!statusHasFailure)
+                        {
+                            statusHasCompleteSuccess =
+                                item.LastCommit.Statuses.All(status => status.State == StatusState.Success);
+                        }
                     }
 
-                    if (statusHasFailure)
+                    if (checksHasFailure || statusHasFailure)
                     {
                         item.Checks = PullRequestChecksState.Failure;
                     }
-                    else if (statusHasCompleteSuccess)
+                    else if (statusHasCompleteSuccess && checksHasCompleteSuccess)
                     {
                         item.Checks = PullRequestChecksState.Success;
                     }
@@ -933,9 +959,9 @@ class LastCommitSummaryModel
 
         class CheckSuiteSummaryModel
         {
-            public CheckSuiteConclusionState? Conclusion { get; set; }
+            public CheckConclusionState? Conclusion { get; set; }
 
-            public CheckSuiteStatusState Status { get; set; }
+            public CheckStatusState Status { get; set; }
         }
     }
 }

src/GitHub.App/Services/PullRequestService.cs

@@ -22,7 +22,7 @@ public class PullRequestCheckViewModel: ViewModelBase, IPullRequestCheckViewMode
 
         public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactory viewViewModelFactory, PullRequestDetailModel pullRequest)
         {
-            return pullRequest.Statuses?.Select(model =>
+            var statuses = pullRequest.Statuses?.Select(model =>
             {
                 PullRequestCheckStatus checkStatus;
                 switch (model.State)
@@ -53,8 +53,54 @@ public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactor
                     : AvatarProvider.CreateBitmapImage(DefaultAvatar);
 
                 return pullRequestCheckViewModel;
-
             }) ?? new PullRequestCheckViewModel[0];
+
+            var checks = pullRequest.CheckSuites?.SelectMany(model => model.CheckRuns)
+                .Select(model =>
+                {
+                    PullRequestCheckStatus checkStatus;
+                    switch (model.Status)
+                    {
+                        case CheckStatusState.Requested:
+                        case CheckStatusState.Queued:
+                        case CheckStatusState.InProgress:
+                            checkStatus = PullRequestCheckStatus.Pending;
+                            break;
+
+                        case CheckStatusState.Completed:
+                            switch (model.Conclusion)
+                            {
+                                case CheckConclusionState.Success:
+                                    checkStatus = PullRequestCheckStatus.Success;
+                                    break;
+
+                                case CheckConclusionState.ActionRequired:
+                                case CheckConclusionState.TimedOut:
+                                case CheckConclusionState.Cancelled:
+                                case CheckConclusionState.Failure:
+                                case CheckConclusionState.Neutral:
+                                    checkStatus = PullRequestCheckStatus.Failure;
+                                    break;
+
+                                default:
+                                    throw new ArgumentOutOfRangeException();
+                            }
+
+                            break;
+                        default:
+                            throw new ArgumentOutOfRangeException();
+                    }
+
+                    var pullRequestCheckViewModel = (PullRequestCheckViewModel)viewViewModelFactory.CreateViewModel<IPullRequestCheckViewModel>();
+                    pullRequestCheckViewModel.Title = model.Name;
+                    pullRequestCheckViewModel.Description = model.Summary;
+                    pullRequestCheckViewModel.Status = checkStatus;
+                    pullRequestCheckViewModel.DetailsUrl = new Uri(model.DetailsUrl);
+
+                    return pullRequestCheckViewModel;
+                }) ?? new PullRequestCheckViewModel[0];
+
+            return statuses.Union(checks).OrderBy(model => model.Title);
         }
 
         [ImportingConstructor]

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

@@ -175,7 +175,6 @@
     <Compile Include="Models\IInlineCommentThreadModel.cs" />
     <Compile Include="Models\IPullRequestSessionFile.cs" />
     <Compile Include="Models\PullRequestTextBufferInfo.cs" />
-    <Compile Include="Services\IChecksService.cs" />
     <Compile Include="Services\IModelService.cs" />
     <Compile Include="Services\IGistPublishService.cs" />
     <Compile Include="Services\IPullRequestEditorService.cs" />

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -172,9 +172,9 @@
     <Compile Include="Models\ActorModel.cs" />
     <Compile Include="Models\AnnotationModel.cs" />
     <Compile Include="Models\CheckAnnotationLevel.cs" />
-    <Compile Include="Models\CheckConclusionStateEnum.cs" />
+    <Compile Include="Models\CheckConclusionState.cs" />
     <Compile Include="Models\CheckRunModel.cs" />
-    <Compile Include="Models\CheckStatusStateEnum.cs" />
+    <Compile Include="Models\CheckStatusState.cs" />
     <Compile Include="Models\CheckSuiteModel.cs" />
     <Compile Include="Models\CommitMessage.cs" />
     <Compile Include="Models\DiffChangeType.cs" />

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

@@ -14,7 +14,7 @@ public class CheckRunAnnotationModel
 
         public string Title { get; set; }
 
-        public CheckAnnotationLevel? WarningLevel { get; set; }
+        public CheckAnnotationLevel? AnnotationLevel { get; set; }
 
         public string RawDetails { get; set; }
     }

src/GitHub.Exports/GitHub.Exports.csproj

@@ -1,6 +1,6 @@
 namespace GitHub.Models
 {
-    public enum CheckSuiteConclusionState
+    public enum CheckConclusionState
     {
         ActionRequired,
         TimedOut,

src/GitHub.Exports/Models/AnnotationModel.cs

@@ -5,14 +5,20 @@ namespace GitHub.Models
 {
     public class CheckRunModel
     {
-        public CheckSuiteConclusionState? Conclusion { get; set; }
+        public CheckConclusionState? Conclusion { get; set; }
 
-        public CheckSuiteStatusState Status { get; set; }
+        public CheckStatusState Status { get; set; }
 
         public DateTimeOffset? StartedAt { get; set; }
 
         public DateTimeOffset? CompletedAt { get; set; }
 
         public List<CheckRunAnnotationModel> Annotations { get; set; }
+
+        public string Name { get; set; }
+
+        public string DetailsUrl { get; set; }
+
+        public string Summary { get; set; }
     }
 }

src/GitHub.Exports/Models/CheckSuiteConclusionState.cs renamed to src/GitHub.Exports/Models/CheckConclusionState.cs

@@ -1,10 +1,10 @@
 namespace GitHub.Models
 {
-    public enum CheckSuiteStatusState
+    public enum CheckStatusState
     {
-        Requested,
         Queued,
         InProgress,
         Completed,
+        Requested,
     }
 }