winebarrel · winebarrel · Dec 1, 2024 · Dec 1, 2024
diff --git a/Makefile b/Makefile
@@ -28,6 +28,10 @@ clean:
 schema:
 	curl -sSfLo Pulse/Github/schema.graphqls https://docs.github.com/public/fpt/schema.docs.graphql
 
+.PHONY: clean-generated
+clean-generated:
+	rm -rf Pulse/Github/{Github.graphql.swift,Operations,Schema}
+
 .PHONY: generate
-generate:
+generate: clean-generated
 	./apollo-ios-cli generate
diff --git a/Pulse/ContentListView.swift b/Pulse/ContentListView.swift
@@ -57,13 +57,6 @@ struct ContentListView: View {
                             .foregroundColor(.primary)
                         }
                     }
-                    if let author = pull.commentAuthor {
-                        HStack(spacing: 0) {
-                            Image(systemName: "bubble")
-                            Text("@\(author)")
-                                .font(.footnote)
-                        }
-                    }
                 }
             }
         }

diff --git a/Pulse/GitHubAPI.swift b/Pulse/GitHubAPI.swift
@@ -6,10 +6,9 @@
     let repo: String
     let title: String
     let url: String
+    let latestUrl: String
     let mergeable: Github.MergeableState // NOTE: It might use
     let commitUrl: String
-    let commentAuthor: String?
-    let commentUrl: String?
     let draft: Bool
     let approvedCount: Int
     let reviewResult: ReviewResult
@@ -31,10 +30,6 @@
             (reviewResult == .pending && checkResult == .success)
     }
 
-    var latestUrl: String {
-        commentUrl ?? url
-    }
-
     enum ReviewResult {
         case success
         case failure
@@ -71,7 +66,7 @@
        client = ApolloClient(networkTransport: transport, store: store)
    }

    func fetch(_ githubQuery: String) async throws -> PullRequests {
        return try await withCheckedThrowingContinuation { continuation in
            let query = Github.SearchPullRequestsQuery(query: githubQuery)

@@ -111,15 +106,31 @@
 
                             let updatedAt = ISO8601DateFormatter().date(from: asPull.updatedAt) ?? Date(timeIntervalSince1970: 0)
 
+                            let comment = asPull.comments.edges?.first??.node
+                            let review = asPull.reviews?.edges?.first??.node
+
+                            let latestUrl = if let comment, let review {
+                                if comment.createdAt > review.createdAt {
+                                    comment.url
+                                } else {
+                                    review.url
+                                }
+                            } else if let comment {
+                                commit.url
+                            } else if let review {
+                                review.url
+                            } else {
+                                asPull.url
+                            }
+
                             let pull = PullRequest(
                                 owner: asPull.repository.owner.login,
                                 repo: asPull.repository.name,
                                 title: asPull.title,
                                 url: asPull.url,
+                                latestUrl: latestUrl,
                                 mergeable: asPull.mergeable.value ?? Github.MergeableState.unknown,
                                 commitUrl: commit.url,
-                                commentAuthor: asPull.comments.nodes?.first??.author?.login,
-                                commentUrl: asPull.comments.nodes?.first??.url,
                                 draft: asPull.isDraft,
                                 approvedCount: asPull.approvedReviews?.totalCount ?? 0,
                                 reviewResult: reviewResult,
@@ -136,7 +147,7 @@
                    if let err = err as? Apollo.ResponseCodeInterceptor.ResponseCodeError,
                       case .invalidResponseCode(let respOrNil, _) = err,
                       let resp = respOrNil
                    {
                        continuation.resume(throwing: GitHubError.respNotOK(resp))
                    } else {
                        continuation.resume(throwing: err)

diff --git a/Pulse/Github/Operations/Queries/SearchPullRequestsQuery.graphql.swift b/Pulse/Github/Operations/Queries/SearchPullRequestsQuery.graphql.swift
@@ -8,7 +8,7 @@ extension Github {
     static let operationName: String = "SearchPullRequests"
     static let operationDocument: ApolloAPI.OperationDocument = .init(
       definition: .init(
-        #"query SearchPullRequests($query: String!) { search(type: ISSUE, last: 100, query: $query) { __typename nodes { __typename ... on PullRequest { repository { __typename name owner { __typename login } } title url reviewDecision mergeable isDraft updatedAt comments(last: 1) { __typename nodes { __typename author { __typename login } url } } commits(last: 1) { __typename nodes { __typename commit { __typename url statusCheckRollup { __typename state } } } } approvedReviews: reviews(states: APPROVED) { __typename totalCount } } } } }"#
+        #"query SearchPullRequests($query: String!) { search(type: ISSUE, last: 100, query: $query) { __typename nodes { __typename ... on PullRequest { repository { __typename name owner { __typename login } } title url reviewDecision mergeable isDraft updatedAt comments(last: 1) { __typename edges { __typename node { __typename url createdAt } } } reviews(last: 1) { __typename edges { __typename node { __typename url createdAt } } } commits(last: 1) { __typename nodes { __typename commit { __typename url statusCheckRollup { __typename state } } } } approvedReviews: reviews(states: APPROVED) { __typename totalCount } } } } }"#
       ))
 
     public var query: String
@@ -84,6 +84,7 @@ extension Github {
               .field("isDraft", Bool.self),
               .field("updatedAt", Github.DateTime.self),
               .field("comments", Comments.self, arguments: ["last": 1]),
+              .field("reviews", Reviews?.self, arguments: ["last": 1]),
               .field("commits", Commits.self, arguments: ["last": 1]),
               .field("reviews", alias: "approvedReviews", ApprovedReviews?.self, arguments: ["states": "APPROVED"]),
             ] }
@@ -104,6 +105,8 @@ extension Github {
             var updatedAt: Github.DateTime { __data["updatedAt"] }
             /// A list of comments associated with the pull request.
             var comments: Comments { __data["comments"] }
+            /// A list of reviews associated with the pull request.
+            var reviews: Reviews? { __data["reviews"] }
             /// A list of commits present in this pull request's head branch not present in the base branch.
             var commits: Commits { __data["commits"] }
             /// A list of reviews associated with the pull request.
@@ -156,46 +159,100 @@ extension Github {
               static var __parentType: any ApolloAPI.ParentType { Github.Objects.IssueCommentConnection }
               static var __selections: [ApolloAPI.Selection] { [
                 .field("__typename", String.self),
-                .field("nodes", [Node?]?.self),
+                .field("edges", [Edge?]?.self),
               ] }
 
-              /// A list of nodes.
-              var nodes: [Node?]? { __data["nodes"] }
+              /// A list of edges.
+              var edges: [Edge?]? { __data["edges"] }
 
-              /// Search.Node.AsPullRequest.Comments.Node
+              /// Search.Node.AsPullRequest.Comments.Edge
               ///
-              /// Parent Type: `IssueComment`
-              struct Node: Github.SelectionSet {
+              /// Parent Type: `IssueCommentEdge`
+              struct Edge: Github.SelectionSet {
                 let __data: DataDict
                 init(_dataDict: DataDict) { __data = _dataDict }
 
-                static var __parentType: any ApolloAPI.ParentType { Github.Objects.IssueComment }
+                static var __parentType: any ApolloAPI.ParentType { Github.Objects.IssueCommentEdge }
                 static var __selections: [ApolloAPI.Selection] { [
                   .field("__typename", String.self),
-                  .field("author", Author?.self),
-                  .field("url", Github.URI.self),
+                  .field("node", Node?.self),
                 ] }
 
-                /// The actor who authored the comment.
-                var author: Author? { __data["author"] }
-                /// The HTTP URL for this issue comment
-                var url: Github.URI { __data["url"] }
+                /// The item at the end of the edge.
+                var node: Node? { __data["node"] }
 
-                /// Search.Node.AsPullRequest.Comments.Node.Author
+                /// Search.Node.AsPullRequest.Comments.Edge.Node
                 ///
-                /// Parent Type: `Actor`
-                struct Author: Github.SelectionSet {
+                /// Parent Type: `IssueComment`
+                struct Node: Github.SelectionSet {
                   let __data: DataDict
                   init(_dataDict: DataDict) { __data = _dataDict }
 
-                  static var __parentType: any ApolloAPI.ParentType { Github.Interfaces.Actor }
+                  static var __parentType: any ApolloAPI.ParentType { Github.Objects.IssueComment }
                   static var __selections: [ApolloAPI.Selection] { [
                     .field("__typename", String.self),
-                    .field("login", String.self),
+                    .field("url", Github.URI.self),
+                    .field("createdAt", Github.DateTime.self),
                   ] }
 
-                  /// The username of the actor.
-                  var login: String { __data["login"] }
+                  /// The HTTP URL for this issue comment
+                  var url: Github.URI { __data["url"] }
+                  /// Identifies the date and time when the object was created.
+                  var createdAt: Github.DateTime { __data["createdAt"] }
+                }
+              }
+            }
+
+            /// Search.Node.AsPullRequest.Reviews
+            ///
+            /// Parent Type: `PullRequestReviewConnection`
+            struct Reviews: Github.SelectionSet {
+              let __data: DataDict
+              init(_dataDict: DataDict) { __data = _dataDict }
+
+              static var __parentType: any ApolloAPI.ParentType { Github.Objects.PullRequestReviewConnection }
+              static var __selections: [ApolloAPI.Selection] { [
+                .field("__typename", String.self),
+                .field("edges", [Edge?]?.self),
+              ] }
+
+              /// A list of edges.
+              var edges: [Edge?]? { __data["edges"] }
+
+              /// Search.Node.AsPullRequest.Reviews.Edge
+              ///
+              /// Parent Type: `PullRequestReviewEdge`
+              struct Edge: Github.SelectionSet {
+                let __data: DataDict
+                init(_dataDict: DataDict) { __data = _dataDict }
+
+                static var __parentType: any ApolloAPI.ParentType { Github.Objects.PullRequestReviewEdge }
+                static var __selections: [ApolloAPI.Selection] { [
+                  .field("__typename", String.self),
+                  .field("node", Node?.self),
+                ] }
+
+                /// The item at the end of the edge.
+                var node: Node? { __data["node"] }
+
+                /// Search.Node.AsPullRequest.Reviews.Edge.Node
+                ///
+                /// Parent Type: `PullRequestReview`
+                struct Node: Github.SelectionSet {
+                  let __data: DataDict
+                  init(_dataDict: DataDict) { __data = _dataDict }
+
+                  static var __parentType: any ApolloAPI.ParentType { Github.Objects.PullRequestReview }
+                  static var __selections: [ApolloAPI.Selection] { [
+                    .field("__typename", String.self),
+                    .field("url", Github.URI.self),
+                    .field("createdAt", Github.DateTime.self),
+                  ] }
+
+                  /// The HTTP URL permalink for this PullRequestReview.
+                  var url: Github.URI { __data["url"] }
+                  /// Identifies the date and time when the object was created.
+                  var createdAt: Github.DateTime { __data["createdAt"] }
                 }
               }
             }

diff --git a/Pulse/Github/Schema/Objects/IssueCommentEdge.graphql.swift b/Pulse/Github/Schema/Objects/IssueCommentEdge.graphql.swift
@@ -0,0 +1,12 @@
+// @generated
+// This file was automatically generated and should not be edited.
+
+import ApolloAPI
+
+extension Github.Objects {
+  /// An edge in a connection.
+  static let IssueCommentEdge = ApolloAPI.Object(
+    typename: "IssueCommentEdge",
+    implementedInterfaces: []
+  )
+}
diff --git a/Pulse/Github/Schema/Objects/PullRequestReviewEdge.graphql.swift b/Pulse/Github/Schema/Objects/PullRequestReviewEdge.graphql.swift
@@ -0,0 +1,12 @@
+// @generated
+// This file was automatically generated and should not be edited.
+
+import ApolloAPI
+
+extension Github.Objects {
+  /// An edge in a connection.
+  static let PullRequestReviewEdge = ApolloAPI.Object(
+    typename: "PullRequestReviewEdge",
+    implementedInterfaces: []
+  )
+}
diff --git a/Pulse/Github/Schema/SchemaMetadata.graphql.swift b/Pulse/Github/Schema/SchemaMetadata.graphql.swift
@@ -99,6 +99,7 @@ extension Github {
       case "Issue": return Github.Objects.Issue
       case "IssueComment": return Github.Objects.IssueComment
       case "IssueCommentConnection": return Github.Objects.IssueCommentConnection
+      case "IssueCommentEdge": return Github.Objects.IssueCommentEdge
       case "Label": return Github.Objects.Label
       case "LabeledEvent": return Github.Objects.LabeledEvent
       case "Language": return Github.Objects.Language
@@ -192,6 +193,7 @@ extension Github {
       case "PullRequestReview": return Github.Objects.PullRequestReview
       case "PullRequestReviewComment": return Github.Objects.PullRequestReviewComment
       case "PullRequestReviewConnection": return Github.Objects.PullRequestReviewConnection
+      case "PullRequestReviewEdge": return Github.Objects.PullRequestReviewEdge
       case "PullRequestReviewThread": return Github.Objects.PullRequestReviewThread
       case "PullRequestThread": return Github.Objects.PullRequestThread
       case "Push": return Github.Objects.Push

diff --git a/Pulse/Github/SearchPullRequests.graphql b/Pulse/Github/SearchPullRequests.graphql
@@ -15,11 +15,19 @@ query SearchPullRequests($query: String!) {
         isDraft
         updatedAt
         comments(last: 1) {
-          nodes {
-            author {
-              login
+          edges {
+            node {
+              url
+              createdAt
+            }
+          }
+        }
+        reviews(last: 1) {
+          edges {
+            node {
+              url
+              createdAt
             }
-            url
           }
         }
         commits(last: 1) {